@@ -191,7 +191,7 @@ |
||
191 | 191 | * generates Business Report showing total revenue per event. |
192 | 192 | * |
193 | 193 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
194 | - * @return int |
|
194 | + * @return string |
|
195 | 195 | */ |
196 | 196 | private function _revenue_per_event_report( $period = '-1 month' ) { |
197 | 197 |
@@ -122,9 +122,9 @@ |
||
122 | 122 | /** |
123 | 123 | * _transaction_reports |
124 | 124 | * generates Business Reports regarding Transactions |
125 | - * |
|
126 | - * @return void |
|
127 | - */ |
|
125 | + * |
|
126 | + * @return void |
|
127 | + */ |
|
128 | 128 | protected function _transaction_reports() { |
129 | 129 | $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
130 | 130 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | * @param bool $routing |
43 | 43 | * @return \Extend_Transactions_Admin_Page |
44 | 44 | */ |
45 | - public function __construct( $routing = TRUE ) { |
|
46 | - parent::__construct( $routing ); |
|
47 | - define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/'); |
|
48 | - define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/'); |
|
49 | - define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/'); |
|
45 | + public function __construct($routing = TRUE) { |
|
46 | + parent::__construct($routing); |
|
47 | + define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/'); |
|
48 | + define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/'); |
|
49 | + define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/'); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @return void |
59 | 59 | */ |
60 | 60 | protected function _extend_page_config() { |
61 | - $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions'; |
|
61 | + $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions'; |
|
62 | 62 | |
63 | 63 | $new_page_routes = array( |
64 | 64 | 'reports' => array( |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ) |
68 | 68 | ); |
69 | 69 | |
70 | - $this->_page_routes = array_merge( $this->_page_routes, $new_page_routes ); |
|
70 | + $this->_page_routes = array_merge($this->_page_routes, $new_page_routes); |
|
71 | 71 | |
72 | 72 | $new_page_config = array( |
73 | 73 | 'reports' => array( |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | 'filename' => 'transactions_reports' |
82 | 82 | ) |
83 | 83 | ), |
84 | - 'help_tour' => array( 'Transaction_Reports_Help_Tour' ), |
|
84 | + 'help_tour' => array('Transaction_Reports_Help_Tour'), |
|
85 | 85 | 'require_nonce' => FALSE |
86 | 86 | ) |
87 | 87 | ); |
88 | - $this->_page_config = array_merge( $this->_page_config, $new_page_config ); |
|
88 | + $this->_page_config = array_merge($this->_page_config, $new_page_config); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | * @return void |
98 | 98 | */ |
99 | 99 | public function load_scripts_styles_reports() { |
100 | - wp_register_script( 'ee-txn-reports-js', TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true ); |
|
101 | - wp_enqueue_script( 'ee-txn-reports-js' ); |
|
100 | + wp_register_script('ee-txn-reports-js', TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true); |
|
101 | + wp_enqueue_script('ee-txn-reports-js'); |
|
102 | 102 | $this->_transaction_reports_js_setup(); |
103 | 103 | EE_Registry::instance()->load_helper('Money'); |
104 | 104 | EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts(); |
@@ -126,9 +126,9 @@ discard block |
||
126 | 126 | * @return void |
127 | 127 | */ |
128 | 128 | protected function _transaction_reports() { |
129 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
|
129 | + $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php'; |
|
130 | 130 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
131 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, TRUE ); |
|
131 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, TRUE); |
|
132 | 132 | |
133 | 133 | // the final template wrapper |
134 | 134 | $this->display_admin_page_with_no_sidebar(); |
@@ -143,43 +143,43 @@ discard block |
||
143 | 143 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
144 | 144 | * @return string |
145 | 145 | */ |
146 | - private function _revenue_per_day_report( $period = '-1 month' ) { |
|
146 | + private function _revenue_per_day_report($period = '-1 month') { |
|
147 | 147 | |
148 | 148 | $report_ID = 'txn-admin-revenue-per-day-report-dv'; |
149 | 149 | |
150 | 150 | $TXN = EEM_Transaction::instance(); |
151 | 151 | |
152 | - $results = $TXN->get_revenue_per_day_report( $period ); |
|
152 | + $results = $TXN->get_revenue_per_day_report($period); |
|
153 | 153 | $results = (array) $results; |
154 | 154 | $revenue = array(); |
155 | 155 | $subtitle = ''; |
156 | 156 | |
157 | - if ( $results ) { |
|
158 | - $revenue[] = array( __( 'Date (only shows dates that have a revenue greater than 1)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) ); |
|
159 | - foreach ( $results as $result ) { |
|
160 | - if ( $result->revenue > 1 ) { |
|
161 | - $revenue[] = array( $result->txnDate, (float) $result->revenue ); |
|
157 | + if ($results) { |
|
158 | + $revenue[] = array(__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'), __('Total Revenue', 'event_espresso')); |
|
159 | + foreach ($results as $result) { |
|
160 | + if ($result->revenue > 1) { |
|
161 | + $revenue[] = array($result->txnDate, (float) $result->revenue); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | //setup the date range. |
166 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
167 | - $beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
168 | - $ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
169 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
166 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
167 | + $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
168 | + $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
169 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
170 | 170 | } |
171 | 171 | |
172 | - $report_title = __( 'Total Revenue per Day' ); |
|
172 | + $report_title = __('Total Revenue per Day'); |
|
173 | 173 | |
174 | 174 | $report_params = array( |
175 | 175 | 'title' => $report_title, |
176 | 176 | 'subtitle' => $subtitle, |
177 | 177 | 'id' => $report_ID, |
178 | 178 | 'revenue' => $revenue, |
179 | - 'noResults' => empty( $revenue ), |
|
180 | - 'noTxnMsg' => sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' ) |
|
179 | + 'noResults' => empty($revenue), |
|
180 | + 'noTxnMsg' => sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>') |
|
181 | 181 | ); |
182 | - wp_localize_script( 'ee-txn-reports-js', 'txnRevPerDay', $report_params ); |
|
182 | + wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params); |
|
183 | 183 | |
184 | 184 | return $report_ID; |
185 | 185 | } |
@@ -193,44 +193,44 @@ discard block |
||
193 | 193 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
194 | 194 | * @return int |
195 | 195 | */ |
196 | - private function _revenue_per_event_report( $period = '-1 month' ) { |
|
196 | + private function _revenue_per_event_report($period = '-1 month') { |
|
197 | 197 | |
198 | 198 | $report_ID = 'txn-admin-revenue-per-event-report-dv'; |
199 | 199 | |
200 | 200 | $TXN = EEM_Transaction::instance(); |
201 | - $results = $TXN->get_revenue_per_event_report( $period ); |
|
201 | + $results = $TXN->get_revenue_per_event_report($period); |
|
202 | 202 | $results = (array) $results; |
203 | 203 | $revenue = array(); |
204 | 204 | $subtitle = ''; |
205 | 205 | |
206 | - if ( $results ) { |
|
207 | - $revenue[] = array( __( 'Event (only events that have a revenue greater than 1 are shown)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) ); |
|
208 | - foreach ( $results as $result ) { |
|
209 | - if ( $result->revenue > 1 ) { |
|
210 | - $event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ) ); |
|
211 | - $event_name = wp_trim_words( $event_name, 5, '...' ); |
|
212 | - $revenue[] = array( $event_name, (float) $result->revenue ); |
|
206 | + if ($results) { |
|
207 | + $revenue[] = array(__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'), __('Total Revenue', 'event_espresso')); |
|
208 | + foreach ($results as $result) { |
|
209 | + if ($result->revenue > 1) { |
|
210 | + $event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8')); |
|
211 | + $event_name = wp_trim_words($event_name, 5, '...'); |
|
212 | + $revenue[] = array($event_name, (float) $result->revenue); |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 | |
216 | 216 | //setup the date range. |
217 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
218 | - $beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
219 | - $ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
220 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
217 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
218 | + $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
219 | + $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
220 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
221 | 221 | } |
222 | 222 | |
223 | - $report_title = __( 'Total Revenue per Event' ); |
|
223 | + $report_title = __('Total Revenue per Event'); |
|
224 | 224 | |
225 | 225 | $report_params = array( |
226 | 226 | 'title' => $report_title, |
227 | 227 | 'subtitle' => $subtitle, |
228 | 228 | 'id' => $report_ID, |
229 | 229 | 'revenue' => $revenue, |
230 | - 'noResults' => empty( $revenue ), |
|
231 | - 'noTxnMsg' => sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' ) |
|
230 | + 'noResults' => empty($revenue), |
|
231 | + 'noTxnMsg' => sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>') |
|
232 | 232 | ); |
233 | - wp_localize_script( 'ee-txn-reports-js', 'txnRevPerEvent', $report_params ); |
|
233 | + wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params); |
|
234 | 234 | |
235 | 235 | return $report_ID; |
236 | 236 | } |
@@ -1100,14 +1100,14 @@ discard block |
||
1100 | 1100 | $QSG_ID = reset( $id_col ); |
1101 | 1101 | } else { |
1102 | 1102 | //ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method |
1103 | - EE_Log::instance()->log( |
|
1104 | - __FILE__, |
|
1105 | - __FUNCTION__, |
|
1106 | - sprintf( |
|
1107 | - __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), |
|
1108 | - $QST_ID ), |
|
1109 | - 'error' ); |
|
1110 | - continue; |
|
1103 | + EE_Log::instance()->log( |
|
1104 | + __FILE__, |
|
1105 | + __FUNCTION__, |
|
1106 | + sprintf( |
|
1107 | + __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), |
|
1108 | + $QST_ID ), |
|
1109 | + 'error' ); |
|
1110 | + continue; |
|
1111 | 1111 | } |
1112 | 1112 | } |
1113 | 1113 | |
@@ -1509,8 +1509,8 @@ discard block |
||
1509 | 1509 | } |
1510 | 1510 | } |
1511 | 1511 | } |
1512 | - //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it |
|
1513 | - remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 ); |
|
1512 | + //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it |
|
1513 | + remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 ); |
|
1514 | 1514 | |
1515 | 1515 | if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) { |
1516 | 1516 | $db_update_sans_ee4 = array(); |
@@ -57,9 +57,9 @@ discard block |
||
57 | 57 | * @param $table_name |
58 | 58 | * @return string |
59 | 59 | */ |
60 | - public static function ensure_table_name_has_prefix( $table_name ) { |
|
60 | + public static function ensure_table_name_has_prefix($table_name) { |
|
61 | 61 | global $wpdb; |
62 | - return strpos( $table_name, $wpdb->prefix ) === 0 ? $table_name : $wpdb->prefix . $table_name; |
|
62 | + return strpos($table_name, $wpdb->prefix) === 0 ? $table_name : $wpdb->prefix.$table_name; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * be called on plugin activation and reactivation |
86 | 86 | * @return boolean success, whether the database and folders are setup properly |
87 | 87 | */ |
88 | - public static function initialize_db_and_folders(){ |
|
88 | + public static function initialize_db_and_folders() { |
|
89 | 89 | $good_filesystem = EEH_Activation::create_upload_directories(); |
90 | 90 | $good_db = EEH_Activation::create_database_tables(); |
91 | 91 | return $good_filesystem && $good_db; |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | * upon activation of a new plugin, reactivation, and at the end |
100 | 100 | * of running migration scripts |
101 | 101 | */ |
102 | - public static function initialize_db_content(){ |
|
102 | + public static function initialize_db_content() { |
|
103 | 103 | //let's avoid doing all this logic repeatedly, especially when addons are requesting it |
104 | - if( EEH_Activation::$_initialized_db_content_already_in_this_request ) { |
|
104 | + if (EEH_Activation::$_initialized_db_content_already_in_this_request) { |
|
105 | 105 | return; |
106 | 106 | } |
107 | 107 | EEH_Activation::$_initialized_db_content_already_in_this_request = true; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | EEH_Activation::remove_cron_tasks(); |
119 | 119 | EEH_Activation::create_cron_tasks(); |
120 | 120 | //also, check for CAF default db content |
121 | - do_action( 'AHEE__EEH_Activation__initialize_db_content' ); |
|
121 | + do_action('AHEE__EEH_Activation__initialize_db_content'); |
|
122 | 122 | //also: EEM_Gateways::load_all_gateways() outputs a lot of success messages |
123 | 123 | //which users really won't care about on initial activation |
124 | 124 | EE_Error::overwrite_success(); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * @return array |
138 | 138 | * @throws \EE_Error |
139 | 139 | */ |
140 | - public static function get_cron_tasks( $which_to_include ) { |
|
140 | + public static function get_cron_tasks($which_to_include) { |
|
141 | 141 | $cron_tasks = apply_filters( |
142 | 142 | 'FHEE__EEH_Activation__get_cron_tasks', |
143 | 143 | array( |
@@ -146,17 +146,17 @@ discard block |
||
146 | 146 | 'AHEE__EE_Cron_Tasks__update_transaction_with_payment' => EEH_Activation::cron_task_no_longer_in_use, //there may have been a bug which prevented from these cron tasks from getting unscheduled, so we might want to remove these for a few updates |
147 | 147 | ) |
148 | 148 | ); |
149 | - if( $which_to_include === 'all' ) { |
|
149 | + if ($which_to_include === 'all') { |
|
150 | 150 | //leave as-is |
151 | - }elseif( $which_to_include === 'old' ) { |
|
152 | - $cron_tasks = array_filter( $cron_tasks, function ( $value ) { |
|
151 | + }elseif ($which_to_include === 'old') { |
|
152 | + $cron_tasks = array_filter($cron_tasks, function($value) { |
|
153 | 153 | return $value === EEH_Activation::cron_task_no_longer_in_use; |
154 | 154 | }); |
155 | - }elseif( $which_to_include === 'current' ) { |
|
156 | - $cron_tasks = array_filter( $cron_tasks ); |
|
157 | - }elseif( WP_DEBUG ) { |
|
158 | - throw new EE_Error( sprintf( __( 'Invalidate argument of "%1$s" passed to EEH_Activation::get_cron_tasks. Valid values are "all", "old" and "current".', 'event_espresso' ), $which_to_include ) ); |
|
159 | - }else{ |
|
155 | + }elseif ($which_to_include === 'current') { |
|
156 | + $cron_tasks = array_filter($cron_tasks); |
|
157 | + }elseif (WP_DEBUG) { |
|
158 | + throw new EE_Error(sprintf(__('Invalidate argument of "%1$s" passed to EEH_Activation::get_cron_tasks. Valid values are "all", "old" and "current".', 'event_espresso'), $which_to_include)); |
|
159 | + } else { |
|
160 | 160 | //leave as-is |
161 | 161 | } |
162 | 162 | return $cron_tasks; |
@@ -167,9 +167,9 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public static function create_cron_tasks() { |
169 | 169 | |
170 | - foreach( EEH_Activation::get_cron_tasks( 'current' ) as $hook_name => $frequency ) { |
|
171 | - if( ! wp_next_scheduled( $hook_name ) ) { |
|
172 | - wp_schedule_event( time(), $frequency, $hook_name ); |
|
170 | + foreach (EEH_Activation::get_cron_tasks('current') as $hook_name => $frequency) { |
|
171 | + if ( ! wp_next_scheduled($hook_name)) { |
|
172 | + wp_schedule_event(time(), $frequency, $hook_name); |
|
173 | 173 | } |
174 | 174 | } |
175 | 175 | |
@@ -179,10 +179,10 @@ discard block |
||
179 | 179 | * Remove the currently-existing and now-removed cron tasks. |
180 | 180 | * @param boolean $remove_all whether to only remove the old ones, or remove absolutely ALL the EE ones |
181 | 181 | */ |
182 | - public static function remove_cron_tasks( $remove_all = true ) { |
|
182 | + public static function remove_cron_tasks($remove_all = true) { |
|
183 | 183 | $cron_tasks_to_remove = $remove_all ? 'all' : 'old'; |
184 | 184 | $crons = _get_cron_array(); |
185 | - $crons = is_array( $crons ) ? $crons : array(); |
|
185 | + $crons = is_array($crons) ? $crons : array(); |
|
186 | 186 | /* reminder that $crons looks like: top-level keys are timestamps, |
187 | 187 | * and their values are arrays. |
188 | 188 | * The 2nd level arrays have keys with each of the cron task hooknames to run at that time |
@@ -200,14 +200,14 @@ discard block |
||
200 | 200 | * ... |
201 | 201 | * ... |
202 | 202 | */ |
203 | - foreach( EEH_Activation::get_cron_tasks( $cron_tasks_to_remove ) as $hook_name => $frequency ) { |
|
204 | - foreach( $crons as $timestamp => $hooks_to_fire_at_time ) { |
|
205 | - if ( array_key_exists( $hook_name, $hooks_to_fire_at_time ) ) { |
|
206 | - unset( $crons[ $timestamp ][ $hook_name ] ); |
|
203 | + foreach (EEH_Activation::get_cron_tasks($cron_tasks_to_remove) as $hook_name => $frequency) { |
|
204 | + foreach ($crons as $timestamp => $hooks_to_fire_at_time) { |
|
205 | + if (array_key_exists($hook_name, $hooks_to_fire_at_time)) { |
|
206 | + unset($crons[$timestamp][$hook_name]); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | } |
210 | - _set_cron_array( $crons ); |
|
210 | + _set_cron_array($crons); |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | */ |
223 | 223 | public static function CPT_initialization() { |
224 | 224 | // register Custom Post Types |
225 | - EE_Registry::instance()->load_core( 'Register_CPTs' ); |
|
225 | + EE_Registry::instance()->load_core('Register_CPTs'); |
|
226 | 226 | flush_rewrite_rules(); |
227 | 227 | } |
228 | 228 | |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | * @return void |
241 | 241 | */ |
242 | 242 | public static function reset_and_update_config() { |
243 | - do_action( 'AHEE__EE_Config___load_core_config__start', array( 'EEH_Activation', 'load_calendar_config' ) ); |
|
244 | - add_filter( 'FHEE__EE_Config___load_core_config__config_settings', array( 'EEH_Activation', 'migrate_old_config_data' ), 10, 3 ); |
|
243 | + do_action('AHEE__EE_Config___load_core_config__start', array('EEH_Activation', 'load_calendar_config')); |
|
244 | + add_filter('FHEE__EE_Config___load_core_config__config_settings', array('EEH_Activation', 'migrate_old_config_data'), 10, 3); |
|
245 | 245 | //EE_Config::reset(); |
246 | 246 | } |
247 | 247 | |
@@ -254,23 +254,23 @@ discard block |
||
254 | 254 | */ |
255 | 255 | public static function load_calendar_config() { |
256 | 256 | // grab array of all plugin folders and loop thru it |
257 | - $plugins = glob( WP_PLUGIN_DIR . DS . '*', GLOB_ONLYDIR ); |
|
258 | - if ( empty( $plugins ) ) { |
|
257 | + $plugins = glob(WP_PLUGIN_DIR.DS.'*', GLOB_ONLYDIR); |
|
258 | + if (empty($plugins)) { |
|
259 | 259 | return; |
260 | 260 | } |
261 | - foreach ( $plugins as $plugin_path ) { |
|
261 | + foreach ($plugins as $plugin_path) { |
|
262 | 262 | // grab plugin folder name from path |
263 | - $plugin = basename( $plugin_path ); |
|
263 | + $plugin = basename($plugin_path); |
|
264 | 264 | // drill down to Espresso plugins |
265 | - if ( strpos( $plugin, 'espresso' ) !== FALSE || strpos( $plugin, 'Espresso' ) !== FALSE || strpos( $plugin, 'ee4' ) !== FALSE || strpos( $plugin, 'EE4' ) !== FALSE ) { |
|
265 | + if (strpos($plugin, 'espresso') !== FALSE || strpos($plugin, 'Espresso') !== FALSE || strpos($plugin, 'ee4') !== FALSE || strpos($plugin, 'EE4') !== FALSE) { |
|
266 | 266 | // then to calendar related plugins |
267 | - if ( strpos( $plugin, 'calendar' ) !== FALSE ) { |
|
267 | + if (strpos($plugin, 'calendar') !== FALSE) { |
|
268 | 268 | // this is what we are looking for |
269 | - $calendar_config = $plugin_path . DS . 'EE_Calendar_Config.php'; |
|
269 | + $calendar_config = $plugin_path.DS.'EE_Calendar_Config.php'; |
|
270 | 270 | // does it exist in this folder ? |
271 | - if ( is_readable( $calendar_config )) { |
|
271 | + if (is_readable($calendar_config)) { |
|
272 | 272 | // YEAH! let's load it |
273 | - require_once( $calendar_config ); |
|
273 | + require_once($calendar_config); |
|
274 | 274 | } |
275 | 275 | } |
276 | 276 | } |
@@ -287,21 +287,21 @@ discard block |
||
287 | 287 | * @param \EE_Config $EE_Config |
288 | 288 | * @return \stdClass |
289 | 289 | */ |
290 | - public static function migrate_old_config_data( $settings = array(), $config = '', EE_Config $EE_Config ) { |
|
291 | - $convert_from_array = array( 'addons' ); |
|
290 | + public static function migrate_old_config_data($settings = array(), $config = '', EE_Config $EE_Config) { |
|
291 | + $convert_from_array = array('addons'); |
|
292 | 292 | // in case old settings were saved as an array |
293 | - if ( is_array( $settings ) && in_array( $config, $convert_from_array )) { |
|
293 | + if (is_array($settings) && in_array($config, $convert_from_array)) { |
|
294 | 294 | // convert existing settings to an object |
295 | 295 | $config_array = $settings; |
296 | 296 | $settings = new stdClass(); |
297 | - foreach ( $config_array as $key => $value ){ |
|
298 | - if ( $key == 'calendar' && class_exists( 'EE_Calendar_Config' )) { |
|
299 | - $EE_Config->set_config( 'addons', 'EE_Calendar', 'EE_Calendar_Config', $value ); |
|
297 | + foreach ($config_array as $key => $value) { |
|
298 | + if ($key == 'calendar' && class_exists('EE_Calendar_Config')) { |
|
299 | + $EE_Config->set_config('addons', 'EE_Calendar', 'EE_Calendar_Config', $value); |
|
300 | 300 | } else { |
301 | 301 | $settings->{$key} = $value; |
302 | 302 | } |
303 | 303 | } |
304 | - add_filter( 'FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true' ); |
|
304 | + add_filter('FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true'); |
|
305 | 305 | } |
306 | 306 | return $settings; |
307 | 307 | } |
@@ -317,8 +317,8 @@ discard block |
||
317 | 317 | */ |
318 | 318 | public static function deactivate_event_espresso() { |
319 | 319 | // check permissions |
320 | - if ( current_user_can( 'activate_plugins' )) { |
|
321 | - deactivate_plugins( EE_PLUGIN_BASENAME, TRUE ); |
|
320 | + if (current_user_can('activate_plugins')) { |
|
321 | + deactivate_plugins(EE_PLUGIN_BASENAME, TRUE); |
|
322 | 322 | } |
323 | 323 | } |
324 | 324 | |
@@ -340,25 +340,25 @@ discard block |
||
340 | 340 | $critical_pages = array( |
341 | 341 | array( |
342 | 342 | 'id' =>'reg_page_id', |
343 | - 'name' => __( 'Registration Checkout', 'event_espresso' ), |
|
343 | + 'name' => __('Registration Checkout', 'event_espresso'), |
|
344 | 344 | 'post' => NULL, |
345 | 345 | 'code' => 'ESPRESSO_CHECKOUT' |
346 | 346 | ), |
347 | 347 | array( |
348 | 348 | 'id' => 'txn_page_id', |
349 | - 'name' => __( 'Transactions', 'event_espresso' ), |
|
349 | + 'name' => __('Transactions', 'event_espresso'), |
|
350 | 350 | 'post' => NULL, |
351 | 351 | 'code' => 'ESPRESSO_TXN_PAGE' |
352 | 352 | ), |
353 | 353 | array( |
354 | 354 | 'id' => 'thank_you_page_id', |
355 | - 'name' => __( 'Thank You', 'event_espresso' ), |
|
355 | + 'name' => __('Thank You', 'event_espresso'), |
|
356 | 356 | 'post' => NULL, |
357 | 357 | 'code' => 'ESPRESSO_THANK_YOU' |
358 | 358 | ), |
359 | 359 | array( |
360 | 360 | 'id' => 'cancel_page_id', |
361 | - 'name' => __( 'Registration Cancelled', 'event_espresso' ), |
|
361 | + 'name' => __('Registration Cancelled', 'event_espresso'), |
|
362 | 362 | 'post' => NULL, |
363 | 363 | 'code' => 'ESPRESSO_CANCELLED' |
364 | 364 | ), |
@@ -366,62 +366,62 @@ discard block |
||
366 | 366 | |
367 | 367 | $EE_Core_Config = EE_Registry::instance()->CFG->core; |
368 | 368 | |
369 | - foreach ( $critical_pages as $critical_page ) { |
|
369 | + foreach ($critical_pages as $critical_page) { |
|
370 | 370 | // is critical page ID set in config ? |
371 | - if ( $EE_Core_Config->{$critical_page[ 'id' ]} !== FALSE ) { |
|
371 | + if ($EE_Core_Config->{$critical_page['id']} !== FALSE) { |
|
372 | 372 | // attempt to find post by ID |
373 | - $critical_page['post'] = get_post( $EE_Core_Config->{$critical_page[ 'id' ]} ); |
|
373 | + $critical_page['post'] = get_post($EE_Core_Config->{$critical_page['id']} ); |
|
374 | 374 | } |
375 | 375 | // no dice? |
376 | - if ( $critical_page['post'] == NULL ) { |
|
376 | + if ($critical_page['post'] == NULL) { |
|
377 | 377 | // attempt to find post by title |
378 | - $critical_page['post'] = self::get_page_by_ee_shortcode( $critical_page['code'] ); |
|
378 | + $critical_page['post'] = self::get_page_by_ee_shortcode($critical_page['code']); |
|
379 | 379 | // still nothing? |
380 | - if ( $critical_page['post'] == NULL ) { |
|
381 | - $critical_page = EEH_Activation::create_critical_page( $critical_page ); |
|
380 | + if ($critical_page['post'] == NULL) { |
|
381 | + $critical_page = EEH_Activation::create_critical_page($critical_page); |
|
382 | 382 | // REALLY? Still nothing ??!?!? |
383 | - if ( $critical_page['post'] == NULL ) { |
|
384 | - $msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' ); |
|
385 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
383 | + if ($critical_page['post'] == NULL) { |
|
384 | + $msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso'); |
|
385 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
386 | 386 | break; |
387 | 387 | } |
388 | 388 | } |
389 | 389 | } |
390 | 390 | // track post_shortcodes |
391 | - if ( $critical_page['post'] ) { |
|
392 | - EEH_Activation::_track_critical_page_post_shortcodes( $critical_page ); |
|
391 | + if ($critical_page['post']) { |
|
392 | + EEH_Activation::_track_critical_page_post_shortcodes($critical_page); |
|
393 | 393 | } |
394 | 394 | // check that Post ID matches critical page ID in config |
395 | 395 | if ( |
396 | - isset( $critical_page['post']->ID ) |
|
397 | - && $critical_page['post']->ID != $EE_Core_Config->{$critical_page[ 'id' ]} |
|
396 | + isset($critical_page['post']->ID) |
|
397 | + && $critical_page['post']->ID != $EE_Core_Config->{$critical_page['id']} |
|
398 | 398 | ) { |
399 | 399 | //update Config with post ID |
400 | - $EE_Core_Config->{$critical_page[ 'id' ]} = $critical_page['post']->ID; |
|
401 | - if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE ) ) { |
|
402 | - $msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' ); |
|
403 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
400 | + $EE_Core_Config->{$critical_page['id']} = $critical_page['post']->ID; |
|
401 | + if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) { |
|
402 | + $msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso'); |
|
403 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
404 | 404 | } |
405 | 405 | } |
406 | 406 | |
407 | 407 | $critical_page_problem = |
408 | - ! isset( $critical_page['post']->post_status ) |
|
408 | + ! isset($critical_page['post']->post_status) |
|
409 | 409 | || $critical_page['post']->post_status != 'publish' |
410 | - || strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE |
|
410 | + || strpos($critical_page['post']->post_content, $critical_page['code']) === FALSE |
|
411 | 411 | ? TRUE |
412 | 412 | : $critical_page_problem; |
413 | 413 | |
414 | 414 | } |
415 | 415 | |
416 | - if ( $critical_page_problem ) { |
|
416 | + if ($critical_page_problem) { |
|
417 | 417 | $msg = sprintf( |
418 | - __('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso' ), |
|
419 | - '<a href="' . admin_url('admin.php?page=espresso_general_settings&action=critical_pages') . '">' . __('Event Espresso Critical Pages Settings', 'event_espresso') . '</a>' |
|
418 | + __('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso'), |
|
419 | + '<a href="'.admin_url('admin.php?page=espresso_general_settings&action=critical_pages').'">'.__('Event Espresso Critical Pages Settings', 'event_espresso').'</a>' |
|
420 | 420 | ); |
421 | - EE_Error::add_persistent_admin_notice( 'critical_page_problem', $msg ); |
|
421 | + EE_Error::add_persistent_admin_notice('critical_page_problem', $msg); |
|
422 | 422 | } |
423 | - if ( EE_Error::has_notices() ) { |
|
424 | - EE_Error::get_notices( FALSE, TRUE, TRUE ); |
|
423 | + if (EE_Error::has_notices()) { |
|
424 | + EE_Error::get_notices(FALSE, TRUE, TRUE); |
|
425 | 425 | } |
426 | 426 | } |
427 | 427 | |
@@ -433,13 +433,13 @@ discard block |
||
433 | 433 | * parameter to the shortcode |
434 | 434 | * @return WP_Post or NULl |
435 | 435 | */ |
436 | - public static function get_page_by_ee_shortcode($ee_shortcode){ |
|
436 | + public static function get_page_by_ee_shortcode($ee_shortcode) { |
|
437 | 437 | global $wpdb; |
438 | 438 | $shortcode_and_opening_bracket = '['.$ee_shortcode; |
439 | 439 | $post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1"); |
440 | - if($post_id){ |
|
440 | + if ($post_id) { |
|
441 | 441 | return get_post($post_id); |
442 | - }else{ |
|
442 | + } else { |
|
443 | 443 | return NULL; |
444 | 444 | } |
445 | 445 | |
@@ -456,32 +456,32 @@ discard block |
||
456 | 456 | * @param array $critical_page |
457 | 457 | * @return array |
458 | 458 | */ |
459 | - public static function create_critical_page( $critical_page ) { |
|
459 | + public static function create_critical_page($critical_page) { |
|
460 | 460 | |
461 | 461 | $post_args = array( |
462 | 462 | 'post_title' => $critical_page['name'], |
463 | 463 | 'post_status' => 'publish', |
464 | 464 | 'post_type' => 'page', |
465 | 465 | 'comment_status' => 'closed', |
466 | - 'post_content' => '[' . $critical_page['code'] . ']' |
|
466 | + 'post_content' => '['.$critical_page['code'].']' |
|
467 | 467 | ); |
468 | 468 | |
469 | - $post_id = wp_insert_post( $post_args ); |
|
470 | - if ( ! $post_id ) { |
|
469 | + $post_id = wp_insert_post($post_args); |
|
470 | + if ( ! $post_id) { |
|
471 | 471 | $msg = sprintf( |
472 | - __( 'The Event Espresso critical page entitled "%s" could not be created.', 'event_espresso' ), |
|
472 | + __('The Event Espresso critical page entitled "%s" could not be created.', 'event_espresso'), |
|
473 | 473 | $critical_page['name'] |
474 | 474 | ); |
475 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
475 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
476 | 476 | return $critical_page; |
477 | 477 | } |
478 | 478 | // get newly created post's details |
479 | - if ( ! $critical_page['post'] = get_post( $post_id )) { |
|
479 | + if ( ! $critical_page['post'] = get_post($post_id)) { |
|
480 | 480 | $msg = sprintf( |
481 | - __( 'The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso' ), |
|
481 | + __('The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso'), |
|
482 | 482 | $critical_page['name'] |
483 | 483 | ); |
484 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
484 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
485 | 485 | } |
486 | 486 | |
487 | 487 | return $critical_page; |
@@ -500,35 +500,35 @@ discard block |
||
500 | 500 | * @param array $critical_page |
501 | 501 | * @return void |
502 | 502 | */ |
503 | - private static function _track_critical_page_post_shortcodes( $critical_page = array() ) { |
|
503 | + private static function _track_critical_page_post_shortcodes($critical_page = array()) { |
|
504 | 504 | // check the goods |
505 | - if ( ! $critical_page['post'] instanceof WP_Post ) { |
|
505 | + if ( ! $critical_page['post'] instanceof WP_Post) { |
|
506 | 506 | $msg = sprintf( |
507 | - __( 'The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso' ), |
|
507 | + __('The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso'), |
|
508 | 508 | $critical_page['name'] |
509 | 509 | ); |
510 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
510 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
511 | 511 | return; |
512 | 512 | } |
513 | 513 | $EE_Core_Config = EE_Registry::instance()->CFG->core; |
514 | 514 | // map shortcode to post |
515 | - $EE_Core_Config->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID; |
|
515 | + $EE_Core_Config->post_shortcodes[$critical_page['post']->post_name][$critical_page['code']] = $critical_page['post']->ID; |
|
516 | 516 | // and make sure it's NOT added to the WP "Posts Page" |
517 | 517 | // name of the WP Posts Page |
518 | 518 | $posts_page = EE_Registry::instance()->CFG->get_page_for_posts(); |
519 | - if ( isset( $EE_Core_Config->post_shortcodes[ $posts_page ] )) { |
|
520 | - unset( $EE_Core_Config->post_shortcodes[ $posts_page ][ $critical_page['code'] ] ); |
|
519 | + if (isset($EE_Core_Config->post_shortcodes[$posts_page])) { |
|
520 | + unset($EE_Core_Config->post_shortcodes[$posts_page][$critical_page['code']]); |
|
521 | 521 | } |
522 | - if ( $posts_page != 'posts' && isset( $EE_Core_Config->post_shortcodes['posts'] )) { |
|
523 | - unset( $EE_Core_Config->post_shortcodes['posts'][ $critical_page['code'] ] ); |
|
522 | + if ($posts_page != 'posts' && isset($EE_Core_Config->post_shortcodes['posts'])) { |
|
523 | + unset($EE_Core_Config->post_shortcodes['posts'][$critical_page['code']]); |
|
524 | 524 | } |
525 | 525 | // update post_shortcode CFG |
526 | - if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) { |
|
526 | + if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) { |
|
527 | 527 | $msg = sprintf( |
528 | - __( 'The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso' ), |
|
528 | + __('The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso'), |
|
529 | 529 | $critical_page['name'] |
530 | 530 | ); |
531 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
531 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
532 | 532 | } |
533 | 533 | } |
534 | 534 | |
@@ -546,24 +546,24 @@ discard block |
||
546 | 546 | public static function get_default_creator_id() { |
547 | 547 | global $wpdb; |
548 | 548 | |
549 | - if ( ! empty( self::$_default_creator_id ) ) { |
|
549 | + if ( ! empty(self::$_default_creator_id)) { |
|
550 | 550 | return self::$_default_creator_id; |
551 | 551 | }/**/ |
552 | 552 | |
553 | - $role_to_check = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator' ); |
|
553 | + $role_to_check = apply_filters('FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator'); |
|
554 | 554 | |
555 | 555 | //let's allow pre_filtering for early exits by alternative methods for getting id. We check for truthy result and if so then exit early. |
556 | - $pre_filtered_id = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check ); |
|
557 | - if ( $pre_filtered_id !== false ) { |
|
556 | + $pre_filtered_id = apply_filters('FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check); |
|
557 | + if ($pre_filtered_id !== false) { |
|
558 | 558 | return (int) $pre_filtered_id; |
559 | 559 | } |
560 | 560 | |
561 | - $capabilities_key = EEH_Activation::ensure_table_name_has_prefix( 'capabilities' ); |
|
562 | - $query = $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%' . $role_to_check . '%' ); |
|
563 | - $user_id = $wpdb->get_var( $query ); |
|
564 | - $user_id = apply_filters( 'FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id ); |
|
565 | - if ( $user_id && intval( $user_id ) ) { |
|
566 | - self::$_default_creator_id = intval( $user_id ); |
|
561 | + $capabilities_key = EEH_Activation::ensure_table_name_has_prefix('capabilities'); |
|
562 | + $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%'.$role_to_check.'%'); |
|
563 | + $user_id = $wpdb->get_var($query); |
|
564 | + $user_id = apply_filters('FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id); |
|
565 | + if ($user_id && intval($user_id)) { |
|
566 | + self::$_default_creator_id = intval($user_id); |
|
567 | 567 | return self::$_default_creator_id; |
568 | 568 | } else { |
569 | 569 | return NULL; |
@@ -590,29 +590,29 @@ discard block |
||
590 | 590 | * @return void |
591 | 591 | * @throws EE_Error if there are database errors |
592 | 592 | */ |
593 | - public static function create_table( $table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false ) { |
|
594 | - if( apply_filters( 'FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql ) ){ |
|
593 | + public static function create_table($table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false) { |
|
594 | + if (apply_filters('FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql)) { |
|
595 | 595 | return; |
596 | 596 | } |
597 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
598 | - if ( ! function_exists( 'dbDelta' )) { |
|
599 | - require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); |
|
597 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
598 | + if ( ! function_exists('dbDelta')) { |
|
599 | + require_once(ABSPATH.'wp-admin/includes/upgrade.php'); |
|
600 | 600 | } |
601 | 601 | /** @var WPDB $wpdb */ |
602 | 602 | global $wpdb; |
603 | - $wp_table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
603 | + $wp_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
604 | 604 | // do we need to first delete an existing version of this table ? |
605 | - if ( $drop_pre_existing_table && EEH_Activation::table_exists( $wp_table_name ) ){ |
|
605 | + if ($drop_pre_existing_table && EEH_Activation::table_exists($wp_table_name)) { |
|
606 | 606 | // ok, delete the table... but ONLY if it's empty |
607 | - $deleted_safely = EEH_Activation::delete_db_table_if_empty( $wp_table_name ); |
|
607 | + $deleted_safely = EEH_Activation::delete_db_table_if_empty($wp_table_name); |
|
608 | 608 | // table is NOT empty, are you SURE you want to delete this table ??? |
609 | - if ( ! $deleted_safely && defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){ |
|
610 | - EEH_Activation::delete_unused_db_table( $wp_table_name ); |
|
611 | - } else if ( ! $deleted_safely ) { |
|
609 | + if ( ! $deleted_safely && defined('EE_DROP_BAD_TABLES') && EE_DROP_BAD_TABLES) { |
|
610 | + EEH_Activation::delete_unused_db_table($wp_table_name); |
|
611 | + } else if ( ! $deleted_safely) { |
|
612 | 612 | // so we should be more cautious rather than just dropping tables so easily |
613 | 613 | EE_Error::add_persistent_admin_notice( |
614 | - 'bad_table_' . $wp_table_name . '_detected', |
|
615 | - sprintf( __( 'Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso' ), |
|
614 | + 'bad_table_'.$wp_table_name.'_detected', |
|
615 | + sprintf(__('Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso'), |
|
616 | 616 | $wp_table_name, |
617 | 617 | "<pre>define( 'EE_DROP_BAD_TABLES', TRUE );</pre>", |
618 | 618 | '<b>wp-config.php</b>', |
@@ -621,25 +621,25 @@ discard block |
||
621 | 621 | } |
622 | 622 | } |
623 | 623 | // does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns ) |
624 | - if ( preg_match( '((((.*?))(,\s))+)', $sql, $valid_column_data ) ) { |
|
624 | + if (preg_match('((((.*?))(,\s))+)', $sql, $valid_column_data)) { |
|
625 | 625 | $SQL = "CREATE TABLE $wp_table_name ( $sql ) $engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;"; |
626 | 626 | //get $wpdb to echo errors, but buffer them. This way at least WE know an error |
627 | 627 | //happened. And then we can choose to tell the end user |
628 | - $old_show_errors_policy = $wpdb->show_errors( TRUE ); |
|
629 | - $old_error_suppression_policy = $wpdb->suppress_errors( FALSE ); |
|
628 | + $old_show_errors_policy = $wpdb->show_errors(TRUE); |
|
629 | + $old_error_suppression_policy = $wpdb->suppress_errors(FALSE); |
|
630 | 630 | ob_start(); |
631 | - dbDelta( $SQL ); |
|
631 | + dbDelta($SQL); |
|
632 | 632 | $output = ob_get_contents(); |
633 | 633 | ob_end_clean(); |
634 | - $wpdb->show_errors( $old_show_errors_policy ); |
|
635 | - $wpdb->suppress_errors( $old_error_suppression_policy ); |
|
636 | - if( ! empty( $output ) ){ |
|
637 | - throw new EE_Error( $output ); |
|
634 | + $wpdb->show_errors($old_show_errors_policy); |
|
635 | + $wpdb->suppress_errors($old_error_suppression_policy); |
|
636 | + if ( ! empty($output)) { |
|
637 | + throw new EE_Error($output); |
|
638 | 638 | } |
639 | 639 | } else { |
640 | 640 | throw new EE_Error( |
641 | 641 | sprintf( |
642 | - __( 'The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso' ), |
|
642 | + __('The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso'), |
|
643 | 643 | '<br />', |
644 | 644 | $sql |
645 | 645 | ) |
@@ -661,15 +661,15 @@ discard block |
||
661 | 661 | * @param string $column_info if your SQL were 'ALTER TABLE table_name ADD price VARCHAR(10)', this would be 'VARCHAR(10)' |
662 | 662 | * @return bool|int |
663 | 663 | */ |
664 | - public static function add_column_if_it_doesnt_exist($table_name,$column_name,$column_info='INT UNSIGNED NOT NULL'){ |
|
665 | - if( apply_filters( 'FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE ) ){ |
|
664 | + public static function add_column_if_it_doesnt_exist($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL') { |
|
665 | + if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE)) { |
|
666 | 666 | return FALSE; |
667 | 667 | } |
668 | 668 | global $wpdb; |
669 | - $full_table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
669 | + $full_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
670 | 670 | $fields = self::get_fields_on_table($table_name); |
671 | - if (!in_array($column_name, $fields)){ |
|
672 | - $alter_query="ALTER TABLE $full_table_name ADD $column_name $column_info"; |
|
671 | + if ( ! in_array($column_name, $fields)) { |
|
672 | + $alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info"; |
|
673 | 673 | //echo "alter query:$alter_query"; |
674 | 674 | return $wpdb->query($alter_query); |
675 | 675 | } |
@@ -688,15 +688,15 @@ discard block |
||
688 | 688 | * @param string $table_name, without prefixed $wpdb->prefix |
689 | 689 | * @return array of database column names |
690 | 690 | */ |
691 | - public static function get_fields_on_table( $table_name = NULL ) { |
|
691 | + public static function get_fields_on_table($table_name = NULL) { |
|
692 | 692 | global $wpdb; |
693 | - $table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
694 | - if ( ! empty( $table_name )) { |
|
693 | + $table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
694 | + if ( ! empty($table_name)) { |
|
695 | 695 | $columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name "); |
696 | 696 | if ($columns !== FALSE) { |
697 | 697 | $field_array = array(); |
698 | - foreach($columns as $column ){ |
|
699 | - $field_array[] = $column->Field;; |
|
698 | + foreach ($columns as $column) { |
|
699 | + $field_array[] = $column->Field; ; |
|
700 | 700 | } |
701 | 701 | return $field_array; |
702 | 702 | } |
@@ -714,12 +714,12 @@ discard block |
||
714 | 714 | * @param string $table_name |
715 | 715 | * @return bool |
716 | 716 | */ |
717 | - public static function db_table_is_empty( $table_name ) { |
|
717 | + public static function db_table_is_empty($table_name) { |
|
718 | 718 | global $wpdb; |
719 | - $table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
720 | - if ( EEH_Activation::table_exists( $table_name ) ) { |
|
721 | - $count = $wpdb->get_var( "SELECT COUNT(*) FROM $table_name" ); |
|
722 | - return absint( $count ) === 0 ? true : false; |
|
719 | + $table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
720 | + if (EEH_Activation::table_exists($table_name)) { |
|
721 | + $count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name"); |
|
722 | + return absint($count) === 0 ? true : false; |
|
723 | 723 | } |
724 | 724 | return false; |
725 | 725 | } |
@@ -734,9 +734,9 @@ discard block |
||
734 | 734 | * @param string $table_name |
735 | 735 | * @return bool | int |
736 | 736 | */ |
737 | - public static function delete_db_table_if_empty( $table_name ) { |
|
738 | - if ( EEH_Activation::db_table_is_empty( $table_name ) ) { |
|
739 | - return EEH_Activation::delete_unused_db_table( $table_name ); |
|
737 | + public static function delete_db_table_if_empty($table_name) { |
|
738 | + if (EEH_Activation::db_table_is_empty($table_name)) { |
|
739 | + return EEH_Activation::delete_unused_db_table($table_name); |
|
740 | 740 | } |
741 | 741 | return false; |
742 | 742 | } |
@@ -751,11 +751,11 @@ discard block |
||
751 | 751 | * @param string $table_name |
752 | 752 | * @return bool | int |
753 | 753 | */ |
754 | - public static function delete_unused_db_table( $table_name ) { |
|
754 | + public static function delete_unused_db_table($table_name) { |
|
755 | 755 | global $wpdb; |
756 | - if ( EEH_Activation::table_exists( $table_name ) ) { |
|
757 | - $table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
758 | - return $wpdb->query( "DROP TABLE IF EXISTS $table_name" ); |
|
756 | + if (EEH_Activation::table_exists($table_name)) { |
|
757 | + $table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
758 | + return $wpdb->query("DROP TABLE IF EXISTS $table_name"); |
|
759 | 759 | } |
760 | 760 | return false; |
761 | 761 | } |
@@ -771,18 +771,18 @@ discard block |
||
771 | 771 | * @param string $index_name |
772 | 772 | * @return bool | int |
773 | 773 | */ |
774 | - public static function drop_index( $table_name, $index_name ) { |
|
775 | - if( apply_filters( 'FHEE__EEH_Activation__drop_index__short_circuit', FALSE ) ){ |
|
774 | + public static function drop_index($table_name, $index_name) { |
|
775 | + if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', FALSE)) { |
|
776 | 776 | return FALSE; |
777 | 777 | } |
778 | 778 | global $wpdb; |
779 | - $table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
779 | + $table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
780 | 780 | $index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$index_name'"; |
781 | 781 | if ( |
782 | - $wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name |
|
783 | - && $wpdb->get_var( $index_exists_query ) == $table_name //using get_var with the $index_exists_query returns the table's name |
|
782 | + $wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name |
|
783 | + && $wpdb->get_var($index_exists_query) == $table_name //using get_var with the $index_exists_query returns the table's name |
|
784 | 784 | ) { |
785 | - return $wpdb->query( "ALTER TABLE $table_name DROP INDEX $index_name" ); |
|
785 | + return $wpdb->query("ALTER TABLE $table_name DROP INDEX $index_name"); |
|
786 | 786 | } |
787 | 787 | return TRUE; |
788 | 788 | } |
@@ -798,27 +798,27 @@ discard block |
||
798 | 798 | * @return boolean success (whether database is setup properly or not) |
799 | 799 | */ |
800 | 800 | public static function create_database_tables() { |
801 | - EE_Registry::instance()->load_core( 'Data_Migration_Manager' ); |
|
801 | + EE_Registry::instance()->load_core('Data_Migration_Manager'); |
|
802 | 802 | //find the migration script that sets the database to be compatible with the code |
803 | 803 | $dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms(); |
804 | - if( $dms_name ){ |
|
805 | - $current_data_migration_script = EE_Registry::instance()->load_dms( $dms_name ); |
|
806 | - $current_data_migration_script->set_migrating( false ); |
|
804 | + if ($dms_name) { |
|
805 | + $current_data_migration_script = EE_Registry::instance()->load_dms($dms_name); |
|
806 | + $current_data_migration_script->set_migrating(false); |
|
807 | 807 | $current_data_migration_script->schema_changes_before_migration(); |
808 | 808 | $current_data_migration_script->schema_changes_after_migration(); |
809 | - if( $current_data_migration_script->get_errors() ){ |
|
810 | - if( WP_DEBUG ){ |
|
811 | - foreach( $current_data_migration_script->get_errors() as $error ){ |
|
812 | - EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ ); |
|
809 | + if ($current_data_migration_script->get_errors()) { |
|
810 | + if (WP_DEBUG) { |
|
811 | + foreach ($current_data_migration_script->get_errors() as $error) { |
|
812 | + EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__); |
|
813 | 813 | } |
814 | - }else{ |
|
815 | - EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) ); |
|
814 | + } else { |
|
815 | + EE_Error::add_error(__('There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso')); |
|
816 | 816 | } |
817 | 817 | return false; |
818 | 818 | } |
819 | 819 | EE_Data_Migration_Manager::instance()->update_current_database_state_to(); |
820 | - }else{ |
|
821 | - EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__); |
|
820 | + } else { |
|
821 | + EE_Error::add_error(__('Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
822 | 822 | return false; |
823 | 823 | } |
824 | 824 | return true; |
@@ -838,27 +838,27 @@ discard block |
||
838 | 838 | public static function initialize_system_questions() { |
839 | 839 | // QUESTION GROUPS |
840 | 840 | global $wpdb; |
841 | - $table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group' ); |
|
841 | + $table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question_group'); |
|
842 | 842 | $SQL = "SELECT QSG_system FROM $table_name WHERE QSG_system != 0"; |
843 | 843 | // what we have |
844 | - $question_groups = $wpdb->get_col( $SQL ); |
|
844 | + $question_groups = $wpdb->get_col($SQL); |
|
845 | 845 | // check the response |
846 | - $question_groups = is_array( $question_groups ) ? $question_groups : array(); |
|
846 | + $question_groups = is_array($question_groups) ? $question_groups : array(); |
|
847 | 847 | // what we should have |
848 | - $QSG_systems = array( 1, 2 ); |
|
848 | + $QSG_systems = array(1, 2); |
|
849 | 849 | // loop thru what we should have and compare to what we have |
850 | - foreach ( $QSG_systems as $QSG_system ) { |
|
850 | + foreach ($QSG_systems as $QSG_system) { |
|
851 | 851 | // reset values array |
852 | 852 | $QSG_values = array(); |
853 | 853 | // if we don't have what we should have (but use $QST_system as as string because that's what we got from the db) |
854 | - if ( ! in_array( "$QSG_system", $question_groups )) { |
|
854 | + if ( ! in_array("$QSG_system", $question_groups)) { |
|
855 | 855 | // add it |
856 | - switch ( $QSG_system ) { |
|
856 | + switch ($QSG_system) { |
|
857 | 857 | |
858 | 858 | case 1: |
859 | 859 | $QSG_values = array( |
860 | - 'QSG_name' => __( 'Personal Information', 'event_espresso' ), |
|
861 | - 'QSG_identifier' => 'personal-information-' . time(), |
|
860 | + 'QSG_name' => __('Personal Information', 'event_espresso'), |
|
861 | + 'QSG_identifier' => 'personal-information-'.time(), |
|
862 | 862 | 'QSG_desc' => '', |
863 | 863 | 'QSG_order' => 1, |
864 | 864 | 'QSG_show_group_name' => 1, |
@@ -870,8 +870,8 @@ discard block |
||
870 | 870 | |
871 | 871 | case 2: |
872 | 872 | $QSG_values = array( |
873 | - 'QSG_name' => __( 'Address Information','event_espresso' ), |
|
874 | - 'QSG_identifier' => 'address-information-' . time(), |
|
873 | + 'QSG_name' => __('Address Information', 'event_espresso'), |
|
874 | + 'QSG_identifier' => 'address-information-'.time(), |
|
875 | 875 | 'QSG_desc' => '', |
876 | 876 | 'QSG_order' => 2, |
877 | 877 | 'QSG_show_group_name' => 1, |
@@ -883,14 +883,14 @@ discard block |
||
883 | 883 | |
884 | 884 | } |
885 | 885 | // make sure we have some values before inserting them |
886 | - if ( ! empty( $QSG_values )) { |
|
886 | + if ( ! empty($QSG_values)) { |
|
887 | 887 | // insert system question |
888 | 888 | $wpdb->insert( |
889 | 889 | $table_name, |
890 | 890 | $QSG_values, |
891 | - array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d' ) |
|
891 | + array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d') |
|
892 | 892 | ); |
893 | - $QSG_IDs[ $QSG_system ] = $wpdb->insert_id; |
|
893 | + $QSG_IDs[$QSG_system] = $wpdb->insert_id; |
|
894 | 894 | } |
895 | 895 | } |
896 | 896 | } |
@@ -899,10 +899,10 @@ discard block |
||
899 | 899 | |
900 | 900 | // QUESTIONS |
901 | 901 | global $wpdb; |
902 | - $table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question' ); |
|
902 | + $table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question'); |
|
903 | 903 | $SQL = "SELECT QST_system FROM $table_name WHERE QST_system != ''"; |
904 | 904 | // what we have |
905 | - $questions = $wpdb->get_col( $SQL ); |
|
905 | + $questions = $wpdb->get_col($SQL); |
|
906 | 906 | // what we should have |
907 | 907 | $QST_systems = array( |
908 | 908 | 'fname', |
@@ -919,25 +919,25 @@ discard block |
||
919 | 919 | $order_for_group_1 = 1; |
920 | 920 | $order_for_group_2 = 1; |
921 | 921 | // loop thru what we should have and compare to what we have |
922 | - foreach ( $QST_systems as $QST_system ) { |
|
922 | + foreach ($QST_systems as $QST_system) { |
|
923 | 923 | // reset values array |
924 | 924 | $QST_values = array(); |
925 | 925 | // if we don't have what we should have |
926 | - if ( ! in_array( $QST_system, $questions )) { |
|
926 | + if ( ! in_array($QST_system, $questions)) { |
|
927 | 927 | // add it |
928 | - switch ( $QST_system ) { |
|
928 | + switch ($QST_system) { |
|
929 | 929 | |
930 | 930 | case 'fname': |
931 | 931 | $QST_values = array( |
932 | - 'QST_display_text' => __( 'First Name', 'event_espresso' ), |
|
933 | - 'QST_admin_label' => __( 'First Name - System Question', 'event_espresso' ), |
|
932 | + 'QST_display_text' => __('First Name', 'event_espresso'), |
|
933 | + 'QST_admin_label' => __('First Name - System Question', 'event_espresso'), |
|
934 | 934 | 'QST_system' => 'fname', |
935 | 935 | 'QST_type' => 'TEXT', |
936 | 936 | 'QST_required' => 1, |
937 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
937 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
938 | 938 | 'QST_order' => 1, |
939 | 939 | 'QST_admin_only' => 0, |
940 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
940 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
941 | 941 | 'QST_wp_user' => self::get_default_creator_id(), |
942 | 942 | 'QST_deleted' => 0 |
943 | 943 | ); |
@@ -945,15 +945,15 @@ discard block |
||
945 | 945 | |
946 | 946 | case 'lname': |
947 | 947 | $QST_values = array( |
948 | - 'QST_display_text' => __( 'Last Name', 'event_espresso' ), |
|
949 | - 'QST_admin_label' => __( 'Last Name - System Question', 'event_espresso' ), |
|
948 | + 'QST_display_text' => __('Last Name', 'event_espresso'), |
|
949 | + 'QST_admin_label' => __('Last Name - System Question', 'event_espresso'), |
|
950 | 950 | 'QST_system' => 'lname', |
951 | 951 | 'QST_type' => 'TEXT', |
952 | 952 | 'QST_required' => 1, |
953 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
953 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
954 | 954 | 'QST_order' => 2, |
955 | 955 | 'QST_admin_only' => 0, |
956 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
956 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
957 | 957 | 'QST_wp_user' => self::get_default_creator_id(), |
958 | 958 | 'QST_deleted' => 0 |
959 | 959 | ); |
@@ -961,15 +961,15 @@ discard block |
||
961 | 961 | |
962 | 962 | case 'email': |
963 | 963 | $QST_values = array( |
964 | - 'QST_display_text' => __( 'Email Address', 'event_espresso' ), |
|
965 | - 'QST_admin_label' => __( 'Email Address - System Question', 'event_espresso' ), |
|
964 | + 'QST_display_text' => __('Email Address', 'event_espresso'), |
|
965 | + 'QST_admin_label' => __('Email Address - System Question', 'event_espresso'), |
|
966 | 966 | 'QST_system' => 'email', |
967 | 967 | 'QST_type' => 'TEXT', |
968 | 968 | 'QST_required' => 1, |
969 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
969 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
970 | 970 | 'QST_order' => 3, |
971 | 971 | 'QST_admin_only' => 0, |
972 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
972 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
973 | 973 | 'QST_wp_user' => self::get_default_creator_id(), |
974 | 974 | 'QST_deleted' => 0 |
975 | 975 | ); |
@@ -977,15 +977,15 @@ discard block |
||
977 | 977 | |
978 | 978 | case 'address': |
979 | 979 | $QST_values = array( |
980 | - 'QST_display_text' => __( 'Address', 'event_espresso' ), |
|
981 | - 'QST_admin_label' => __( 'Address - System Question', 'event_espresso' ), |
|
980 | + 'QST_display_text' => __('Address', 'event_espresso'), |
|
981 | + 'QST_admin_label' => __('Address - System Question', 'event_espresso'), |
|
982 | 982 | 'QST_system' => 'address', |
983 | 983 | 'QST_type' => 'TEXT', |
984 | 984 | 'QST_required' => 0, |
985 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
985 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
986 | 986 | 'QST_order' => 4, |
987 | 987 | 'QST_admin_only' => 0, |
988 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
988 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
989 | 989 | 'QST_wp_user' => self::get_default_creator_id(), |
990 | 990 | 'QST_deleted' => 0 |
991 | 991 | ); |
@@ -993,15 +993,15 @@ discard block |
||
993 | 993 | |
994 | 994 | case 'address2': |
995 | 995 | $QST_values = array( |
996 | - 'QST_display_text' => __( 'Address2', 'event_espresso' ), |
|
997 | - 'QST_admin_label' => __( 'Address2 - System Question', 'event_espresso' ), |
|
996 | + 'QST_display_text' => __('Address2', 'event_espresso'), |
|
997 | + 'QST_admin_label' => __('Address2 - System Question', 'event_espresso'), |
|
998 | 998 | 'QST_system' => 'address2', |
999 | 999 | 'QST_type' => 'TEXT', |
1000 | 1000 | 'QST_required' => 0, |
1001 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
1001 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
1002 | 1002 | 'QST_order' => 5, |
1003 | 1003 | 'QST_admin_only' => 0, |
1004 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
1004 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
1005 | 1005 | 'QST_wp_user' => self::get_default_creator_id(), |
1006 | 1006 | 'QST_deleted' => 0 |
1007 | 1007 | ); |
@@ -1009,15 +1009,15 @@ discard block |
||
1009 | 1009 | |
1010 | 1010 | case 'city': |
1011 | 1011 | $QST_values = array( |
1012 | - 'QST_display_text' => __( 'City', 'event_espresso' ), |
|
1013 | - 'QST_admin_label' => __( 'City - System Question', 'event_espresso' ), |
|
1012 | + 'QST_display_text' => __('City', 'event_espresso'), |
|
1013 | + 'QST_admin_label' => __('City - System Question', 'event_espresso'), |
|
1014 | 1014 | 'QST_system' => 'city', |
1015 | 1015 | 'QST_type' => 'TEXT', |
1016 | 1016 | 'QST_required' => 0, |
1017 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
1017 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
1018 | 1018 | 'QST_order' => 6, |
1019 | 1019 | 'QST_admin_only' => 0, |
1020 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
1020 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
1021 | 1021 | 'QST_wp_user' => self::get_default_creator_id(), |
1022 | 1022 | 'QST_deleted' => 0 |
1023 | 1023 | ); |
@@ -1025,12 +1025,12 @@ discard block |
||
1025 | 1025 | |
1026 | 1026 | case 'state': |
1027 | 1027 | $QST_values = array( |
1028 | - 'QST_display_text' => __( 'State/Province', 'event_espresso' ), |
|
1029 | - 'QST_admin_label' => __( 'State/Province - System Question', 'event_espresso' ), |
|
1028 | + 'QST_display_text' => __('State/Province', 'event_espresso'), |
|
1029 | + 'QST_admin_label' => __('State/Province - System Question', 'event_espresso'), |
|
1030 | 1030 | 'QST_system' => 'state', |
1031 | 1031 | 'QST_type' => 'STATE', |
1032 | 1032 | 'QST_required' => 0, |
1033 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
1033 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
1034 | 1034 | 'QST_order' => 7, |
1035 | 1035 | 'QST_admin_only' => 0, |
1036 | 1036 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -1040,12 +1040,12 @@ discard block |
||
1040 | 1040 | |
1041 | 1041 | case 'country' : |
1042 | 1042 | $QST_values = array( |
1043 | - 'QST_display_text' => __( 'Country', 'event_espresso' ), |
|
1044 | - 'QST_admin_label' => __( 'Country - System Question', 'event_espresso' ), |
|
1043 | + 'QST_display_text' => __('Country', 'event_espresso'), |
|
1044 | + 'QST_admin_label' => __('Country - System Question', 'event_espresso'), |
|
1045 | 1045 | 'QST_system' => 'country', |
1046 | 1046 | 'QST_type' => 'COUNTRY', |
1047 | 1047 | 'QST_required' => 0, |
1048 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
1048 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
1049 | 1049 | 'QST_order' => 8, |
1050 | 1050 | 'QST_admin_only' => 0, |
1051 | 1051 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -1055,15 +1055,15 @@ discard block |
||
1055 | 1055 | |
1056 | 1056 | case 'zip': |
1057 | 1057 | $QST_values = array( |
1058 | - 'QST_display_text' => __( 'Zip/Postal Code', 'event_espresso' ), |
|
1059 | - 'QST_admin_label' => __( 'Zip/Postal Code - System Question', 'event_espresso' ), |
|
1058 | + 'QST_display_text' => __('Zip/Postal Code', 'event_espresso'), |
|
1059 | + 'QST_admin_label' => __('Zip/Postal Code - System Question', 'event_espresso'), |
|
1060 | 1060 | 'QST_system' => 'zip', |
1061 | 1061 | 'QST_type' => 'TEXT', |
1062 | 1062 | 'QST_required' => 0, |
1063 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
1063 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
1064 | 1064 | 'QST_order' => 9, |
1065 | 1065 | 'QST_admin_only' => 0, |
1066 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
1066 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
1067 | 1067 | 'QST_wp_user' => self::get_default_creator_id(), |
1068 | 1068 | 'QST_deleted' => 0 |
1069 | 1069 | ); |
@@ -1071,49 +1071,49 @@ discard block |
||
1071 | 1071 | |
1072 | 1072 | case 'phone': |
1073 | 1073 | $QST_values = array( |
1074 | - 'QST_display_text' => __( 'Phone Number', 'event_espresso' ), |
|
1075 | - 'QST_admin_label' => __( 'Phone Number - System Question', 'event_espresso' ), |
|
1074 | + 'QST_display_text' => __('Phone Number', 'event_espresso'), |
|
1075 | + 'QST_admin_label' => __('Phone Number - System Question', 'event_espresso'), |
|
1076 | 1076 | 'QST_system' => 'phone', |
1077 | 1077 | 'QST_type' => 'TEXT', |
1078 | 1078 | 'QST_required' => 0, |
1079 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
1079 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
1080 | 1080 | 'QST_order' => 10, |
1081 | 1081 | 'QST_admin_only' => 0, |
1082 | - 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ), |
|
1082 | + 'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system), |
|
1083 | 1083 | 'QST_wp_user' => self::get_default_creator_id(), |
1084 | 1084 | 'QST_deleted' => 0 |
1085 | 1085 | ); |
1086 | 1086 | break; |
1087 | 1087 | |
1088 | 1088 | } |
1089 | - if ( ! empty( $QST_values )) { |
|
1089 | + if ( ! empty($QST_values)) { |
|
1090 | 1090 | // insert system question |
1091 | 1091 | $wpdb->insert( |
1092 | 1092 | $table_name, |
1093 | 1093 | $QST_values, |
1094 | - array( '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d' ) |
|
1094 | + array('%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d') |
|
1095 | 1095 | ); |
1096 | 1096 | $QST_ID = $wpdb->insert_id; |
1097 | 1097 | |
1098 | 1098 | // QUESTION GROUP QUESTIONS |
1099 | - if( in_array( $QST_system, array( 'fname', 'lname', 'email' ) ) ) { |
|
1099 | + if (in_array($QST_system, array('fname', 'lname', 'email'))) { |
|
1100 | 1100 | $system_question_we_want = EEM_Question_Group::system_personal; |
1101 | 1101 | } else { |
1102 | 1102 | $system_question_we_want = EEM_Question_Group::system_address; |
1103 | 1103 | } |
1104 | - if( isset( $QSG_IDs[ $system_question_we_want ] ) ) { |
|
1105 | - $QSG_ID = $QSG_IDs[ $system_question_we_want ]; |
|
1104 | + if (isset($QSG_IDs[$system_question_we_want])) { |
|
1105 | + $QSG_ID = $QSG_IDs[$system_question_we_want]; |
|
1106 | 1106 | } else { |
1107 | - $id_col = EEM_Question_Group::instance()->get_col( array( array( 'QSG_system' => $system_question_we_want ) ) ); |
|
1108 | - if( is_array( $id_col ) ) { |
|
1109 | - $QSG_ID = reset( $id_col ); |
|
1107 | + $id_col = EEM_Question_Group::instance()->get_col(array(array('QSG_system' => $system_question_we_want))); |
|
1108 | + if (is_array($id_col)) { |
|
1109 | + $QSG_ID = reset($id_col); |
|
1110 | 1110 | } else { |
1111 | 1111 | //ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method |
1112 | 1112 | EE_Log::instance()->log( |
1113 | 1113 | __FILE__, |
1114 | 1114 | __FUNCTION__, |
1115 | 1115 | sprintf( |
1116 | - __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), |
|
1116 | + __('Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), |
|
1117 | 1117 | $QST_ID ), |
1118 | 1118 | 'error' ); |
1119 | 1119 | continue; |
@@ -1122,9 +1122,9 @@ discard block |
||
1122 | 1122 | |
1123 | 1123 | // add system questions to groups |
1124 | 1124 | $wpdb->insert( |
1125 | - EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group_question' ), |
|
1126 | - array( 'QSG_ID' => $QSG_ID , 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID==1)? $order_for_group_1++ : $order_for_group_2++ ), |
|
1127 | - array( '%d', '%d','%d' ) |
|
1125 | + EEH_Activation::ensure_table_name_has_prefix('esp_question_group_question'), |
|
1126 | + array('QSG_ID' => $QSG_ID, 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID == 1) ? $order_for_group_1++ : $order_for_group_2++), |
|
1127 | + array('%d', '%d', '%d') |
|
1128 | 1128 | ); |
1129 | 1129 | } |
1130 | 1130 | } |
@@ -1136,11 +1136,11 @@ discard block |
||
1136 | 1136 | * Makes sure the default payment method (Invoice) is active. |
1137 | 1137 | * This used to be done automatically as part of constructing the old gateways config |
1138 | 1138 | */ |
1139 | - public static function insert_default_payment_methods(){ |
|
1140 | - if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){ |
|
1141 | - EE_Registry::instance()->load_lib( 'Payment_Method_Manager' ); |
|
1142 | - EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' ); |
|
1143 | - }else{ |
|
1139 | + public static function insert_default_payment_methods() { |
|
1140 | + if ( ! EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart)) { |
|
1141 | + EE_Registry::instance()->load_lib('Payment_Method_Manager'); |
|
1142 | + EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice'); |
|
1143 | + } else { |
|
1144 | 1144 | EEM_Payment_Method::instance()->verify_button_urls(); |
1145 | 1145 | } |
1146 | 1146 | } |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | |
1157 | 1157 | global $wpdb; |
1158 | 1158 | |
1159 | - if ( EEH_Activation::table_exists( EEM_Status::instance()->table() ) ) { |
|
1159 | + if (EEH_Activation::table_exists(EEM_Status::instance()->table())) { |
|
1160 | 1160 | |
1161 | 1161 | $table_name = EEM_Status::instance()->table(); |
1162 | 1162 | |
@@ -1222,38 +1222,38 @@ discard block |
||
1222 | 1222 | * @return boolean success of verifying upload directories exist |
1223 | 1223 | */ |
1224 | 1224 | public static function create_upload_directories() { |
1225 | - EE_Registry::instance()->load_helper( 'File' ); |
|
1225 | + EE_Registry::instance()->load_helper('File'); |
|
1226 | 1226 | // Create the required folders |
1227 | 1227 | $folders = array( |
1228 | 1228 | EVENT_ESPRESSO_TEMPLATE_DIR, |
1229 | 1229 | EVENT_ESPRESSO_GATEWAY_DIR, |
1230 | - EVENT_ESPRESSO_UPLOAD_DIR . 'logs/', |
|
1231 | - EVENT_ESPRESSO_UPLOAD_DIR . 'css/', |
|
1232 | - EVENT_ESPRESSO_UPLOAD_DIR . 'tickets/' |
|
1230 | + EVENT_ESPRESSO_UPLOAD_DIR.'logs/', |
|
1231 | + EVENT_ESPRESSO_UPLOAD_DIR.'css/', |
|
1232 | + EVENT_ESPRESSO_UPLOAD_DIR.'tickets/' |
|
1233 | 1233 | ); |
1234 | - foreach ( $folders as $folder ) { |
|
1234 | + foreach ($folders as $folder) { |
|
1235 | 1235 | try { |
1236 | - EEH_File::ensure_folder_exists_and_is_writable( $folder ); |
|
1237 | - @ chmod( $folder, 0755 ); |
|
1238 | - } catch( EE_Error $e ){ |
|
1236 | + EEH_File::ensure_folder_exists_and_is_writable($folder); |
|
1237 | + @ chmod($folder, 0755); |
|
1238 | + } catch (EE_Error $e) { |
|
1239 | 1239 | EE_Error::add_error( |
1240 | 1240 | sprintf( |
1241 | - __( 'Could not create the folder at "%1$s" because: %2$s', 'event_espresso' ), |
|
1241 | + __('Could not create the folder at "%1$s" because: %2$s', 'event_espresso'), |
|
1242 | 1242 | $folder, |
1243 | - '<br />' . $e->getMessage() |
|
1243 | + '<br />'.$e->getMessage() |
|
1244 | 1244 | ), |
1245 | 1245 | __FILE__, __FUNCTION__, __LINE__ |
1246 | 1246 | ); |
1247 | 1247 | //indicate we'll need to fix this later |
1248 | - update_option( EEH_Activation::upload_directories_incomplete_option_name, true ); |
|
1248 | + update_option(EEH_Activation::upload_directories_incomplete_option_name, true); |
|
1249 | 1249 | return FALSE; |
1250 | 1250 | } |
1251 | 1251 | } |
1252 | 1252 | //just add the .htaccess file to the logs directory to begin with. Even if logging |
1253 | 1253 | //is disabled, there might be activation errors recorded in there |
1254 | - EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs/' ); |
|
1254 | + EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs/'); |
|
1255 | 1255 | //remember EE's folders are all good |
1256 | - delete_option( EEH_Activation::upload_directories_incomplete_option_name ); |
|
1256 | + delete_option(EEH_Activation::upload_directories_incomplete_option_name); |
|
1257 | 1257 | return TRUE; |
1258 | 1258 | } |
1259 | 1259 | |
@@ -1266,7 +1266,7 @@ discard block |
||
1266 | 1266 | * @return boolean |
1267 | 1267 | */ |
1268 | 1268 | public static function upload_directories_incomplete() { |
1269 | - return get_option( EEH_Activation::upload_directories_incomplete_option_name, false ); |
|
1269 | + return get_option(EEH_Activation::upload_directories_incomplete_option_name, false); |
|
1270 | 1270 | } |
1271 | 1271 | |
1272 | 1272 | |
@@ -1285,16 +1285,16 @@ discard block |
||
1285 | 1285 | $installed_messengers = $default_messengers = array(); |
1286 | 1286 | |
1287 | 1287 | //include our helper |
1288 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
1288 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
1289 | 1289 | |
1290 | 1290 | //get all installed messenger objects |
1291 | 1291 | $installed = EEH_MSG_Template::get_installed_message_objects(); |
1292 | 1292 | |
1293 | 1293 | //let's setup the $installed messengers in an array AND the messengers that are set to be activated on install. |
1294 | - foreach ( $installed['messengers'] as $msgr ) { |
|
1295 | - if ( $msgr instanceof EE_messenger ) { |
|
1294 | + foreach ($installed['messengers'] as $msgr) { |
|
1295 | + if ($msgr instanceof EE_messenger) { |
|
1296 | 1296 | $installed_messengers[$msgr->name] = $msgr; |
1297 | - if ( $msgr->activate_on_install ) { |
|
1297 | + if ($msgr->activate_on_install) { |
|
1298 | 1298 | $default_messengers[] = $msgr->name; |
1299 | 1299 | } |
1300 | 1300 | } |
@@ -1304,36 +1304,36 @@ discard block |
||
1304 | 1304 | $active_messengers = EEH_MSG_Template::get_active_messengers_in_db(); |
1305 | 1305 | |
1306 | 1306 | //things that have already been activated before |
1307 | - $has_activated = get_option( 'ee_has_activated_messenger' ); |
|
1307 | + $has_activated = get_option('ee_has_activated_messenger'); |
|
1308 | 1308 | |
1309 | 1309 | //do an initial loop to determine if we need to continue |
1310 | 1310 | $def_ms = array(); |
1311 | - foreach ( $default_messengers as $msgr ) { |
|
1312 | - if ( isset($active_messengers[$msgr] ) || isset( $has_activated[$msgr] ) ) continue; |
|
1311 | + foreach ($default_messengers as $msgr) { |
|
1312 | + if (isset($active_messengers[$msgr]) || isset($has_activated[$msgr])) continue; |
|
1313 | 1313 | $def_ms[] = $msgr; |
1314 | 1314 | } |
1315 | 1315 | |
1316 | 1316 | //setup the $installed_mts in an array |
1317 | - foreach ( $installed['message_types'] as $imt ) { |
|
1318 | - if ( $imt instanceof EE_message_type ) { |
|
1317 | + foreach ($installed['message_types'] as $imt) { |
|
1318 | + if ($imt instanceof EE_message_type) { |
|
1319 | 1319 | $installed_mts[$imt->name] = $imt; |
1320 | 1320 | } |
1321 | 1321 | } |
1322 | 1322 | |
1323 | 1323 | //loop through default array for default messengers (if present) |
1324 | - if ( ! empty( $def_ms ) ) { |
|
1325 | - foreach ( $def_ms as $messenger ) { |
|
1324 | + if ( ! empty($def_ms)) { |
|
1325 | + foreach ($def_ms as $messenger) { |
|
1326 | 1326 | //all is good so let's setup the default stuff. We need to use the given messenger object (if exists) to get the default message type for the messenger. |
1327 | - if ( ! isset( $installed_messengers[$messenger] )) { |
|
1327 | + if ( ! isset($installed_messengers[$messenger])) { |
|
1328 | 1328 | continue; |
1329 | 1329 | } |
1330 | 1330 | /** @var EE_messenger[] $installed_messengers */ |
1331 | 1331 | $default_mts = $installed_messengers[$messenger]->get_default_message_types(); |
1332 | 1332 | $active_messengers[$messenger]['obj'] = $installed_messengers[$messenger]; |
1333 | - foreach ( $default_mts as $index => $mt ) { |
|
1333 | + foreach ($default_mts as $index => $mt) { |
|
1334 | 1334 | //is there an installed_mt matching the default string? If not then nothing to do here. |
1335 | - if ( ! isset( $installed_mts[$mt] ) ) { |
|
1336 | - unset( $default_mts[$index] ); |
|
1335 | + if ( ! isset($installed_mts[$mt])) { |
|
1336 | + unset($default_mts[$index]); |
|
1337 | 1337 | continue; |
1338 | 1338 | } |
1339 | 1339 | |
@@ -1342,41 +1342,41 @@ discard block |
||
1342 | 1342 | /** @var EE_message_type[] $installed_mts */ |
1343 | 1343 | $settings_fields = $installed_mts[$mt]->get_admin_settings_fields(); |
1344 | 1344 | $settings = array(); |
1345 | - if ( is_array( $settings_fields ) ) { |
|
1346 | - foreach ( $settings_fields as $field => $values ) { |
|
1347 | - if ( isset( $values['default'] ) ) { |
|
1345 | + if (is_array($settings_fields)) { |
|
1346 | + foreach ($settings_fields as $field => $values) { |
|
1347 | + if (isset($values['default'])) { |
|
1348 | 1348 | $settings[$field] = $values['default']; |
1349 | 1349 | } |
1350 | 1350 | } |
1351 | 1351 | } |
1352 | 1352 | |
1353 | - $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings; |
|
1353 | + $active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings; |
|
1354 | 1354 | $has_activated[$messenger][] = $mt; |
1355 | 1355 | } |
1356 | 1356 | |
1357 | 1357 | //setup any initial settings for the messenger |
1358 | 1358 | $msgr_settings = $installed_messengers[$messenger]->get_admin_settings_fields(); |
1359 | 1359 | |
1360 | - if ( !empty( $msgr_settings ) ) { |
|
1361 | - foreach ( $msgr_settings as $field => $value ) { |
|
1360 | + if ( ! empty($msgr_settings)) { |
|
1361 | + foreach ($msgr_settings as $field => $value) { |
|
1362 | 1362 | $active_messengers[$messenger]['settings'][$field] = $value; |
1363 | 1363 | } |
1364 | 1364 | } |
1365 | 1365 | |
1366 | 1366 | //now let's save the settings for this messenger! Must do now because the validator checks the db for active messengers to validate. |
1367 | - EEH_MSG_Template::update_active_messengers_in_db( $active_messengers ); |
|
1367 | + EEH_MSG_Template::update_active_messengers_in_db($active_messengers); |
|
1368 | 1368 | |
1369 | 1369 | //let's generate all the templates but only if the messenger has default_mts (otherwise its just activated). |
1370 | - if ( !empty( $default_mts ) ) { |
|
1371 | - $success = EEH_MSG_Template::generate_new_templates( $messenger, $default_mts, '', TRUE ); |
|
1370 | + if ( ! empty($default_mts)) { |
|
1371 | + $success = EEH_MSG_Template::generate_new_templates($messenger, $default_mts, '', TRUE); |
|
1372 | 1372 | } |
1373 | 1373 | } |
1374 | 1374 | } //end check for empty( $def_ms ) |
1375 | 1375 | |
1376 | 1376 | //still need to see if there are any message types to activate for active messengers |
1377 | - foreach ( $active_messengers as $messenger => $settings ) { |
|
1377 | + foreach ($active_messengers as $messenger => $settings) { |
|
1378 | 1378 | $msg_obj = $settings['obj']; |
1379 | - if ( ! $msg_obj instanceof EE_messenger ) { |
|
1379 | + if ( ! $msg_obj instanceof EE_messenger) { |
|
1380 | 1380 | continue; |
1381 | 1381 | } |
1382 | 1382 | |
@@ -1384,45 +1384,45 @@ discard block |
||
1384 | 1384 | $new_default_mts = array(); |
1385 | 1385 | |
1386 | 1386 | //loop through each default mt reported by the messenger and make sure its set in its active db entry. |
1387 | - foreach( $all_default_mts as $index => $mt ) { |
|
1387 | + foreach ($all_default_mts as $index => $mt) { |
|
1388 | 1388 | //already active? already has generated templates? || has already been activated before (we dont' want to reactivate things users intentionally deactivated). |
1389 | - if ( ( isset( $has_activated[$messenger] ) && in_array($mt, $has_activated[$messenger]) ) || isset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt] ) || EEH_MSG_Template::already_generated( $messenger, $mt, 0, FALSE ) ) { |
|
1389 | + if ((isset($has_activated[$messenger]) && in_array($mt, $has_activated[$messenger])) || isset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]) || EEH_MSG_Template::already_generated($messenger, $mt, 0, FALSE)) { |
|
1390 | 1390 | continue; |
1391 | 1391 | } |
1392 | 1392 | |
1393 | 1393 | //is there an installed_mt matching the default string? If not then nothing to do here. |
1394 | - if ( ! isset( $installed_mts[$mt] ) ) { |
|
1395 | - unset( $all_default_mts[$mt] ); |
|
1394 | + if ( ! isset($installed_mts[$mt])) { |
|
1395 | + unset($all_default_mts[$mt]); |
|
1396 | 1396 | continue; |
1397 | 1397 | } |
1398 | 1398 | |
1399 | 1399 | $settings_fields = $installed_mts[$mt]->get_admin_settings_fields(); |
1400 | 1400 | $settings = array(); |
1401 | - if ( is_array( $settings_fields ) ) { |
|
1402 | - foreach ( $settings_fields as $field => $values ) { |
|
1403 | - if ( isset( $values['default'] ) ) { |
|
1401 | + if (is_array($settings_fields)) { |
|
1402 | + foreach ($settings_fields as $field => $values) { |
|
1403 | + if (isset($values['default'])) { |
|
1404 | 1404 | $settings[$field] = $values['default']; |
1405 | 1405 | } |
1406 | 1406 | } |
1407 | 1407 | } |
1408 | 1408 | |
1409 | - $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings; |
|
1409 | + $active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings; |
|
1410 | 1410 | $new_default_mts[] = $mt; |
1411 | 1411 | $has_activated[$messenger][] = $mt; |
1412 | 1412 | } |
1413 | 1413 | |
1414 | 1414 | |
1415 | - if ( ! empty( $new_default_mts ) ) { |
|
1416 | - $success = EEH_MSG_Template::generate_new_templates( $messenger, $new_default_mts, '', TRUE ); |
|
1415 | + if ( ! empty($new_default_mts)) { |
|
1416 | + $success = EEH_MSG_Template::generate_new_templates($messenger, $new_default_mts, '', TRUE); |
|
1417 | 1417 | } |
1418 | 1418 | |
1419 | 1419 | } |
1420 | 1420 | |
1421 | 1421 | //now let's save the settings for this messenger! |
1422 | - EEH_MSG_Template::update_active_messengers_in_db( $active_messengers ); |
|
1422 | + EEH_MSG_Template::update_active_messengers_in_db($active_messengers); |
|
1423 | 1423 | |
1424 | 1424 | //update $has_activated record |
1425 | - update_option( 'ee_has_activated_messenger', $has_activated ); |
|
1425 | + update_option('ee_has_activated_messenger', $has_activated); |
|
1426 | 1426 | |
1427 | 1427 | //that's it! |
1428 | 1428 | return $success; |
@@ -1442,47 +1442,47 @@ discard block |
||
1442 | 1442 | */ |
1443 | 1443 | public static function validate_messages_system() { |
1444 | 1444 | //include our helper |
1445 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
1445 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
1446 | 1446 | |
1447 | 1447 | //get active and installed messengers/message types. |
1448 | 1448 | $active_messengers = EEH_MSG_Template::get_active_messengers_in_db(); |
1449 | 1449 | $installed = EEH_MSG_Template::get_installed_message_objects(); |
1450 | 1450 | $installed_messengers = $installed_mts = array(); |
1451 | 1451 | //set up the arrays so they can be handled easier. |
1452 | - foreach( $installed['messengers'] as $im ) { |
|
1453 | - if ( $im instanceof EE_messenger ) { |
|
1452 | + foreach ($installed['messengers'] as $im) { |
|
1453 | + if ($im instanceof EE_messenger) { |
|
1454 | 1454 | $installed_messengers[$im->name] = $im; |
1455 | 1455 | } |
1456 | 1456 | } |
1457 | - foreach( $installed['message_types'] as $imt ) { |
|
1458 | - if ( $imt instanceof EE_message_type ) { |
|
1457 | + foreach ($installed['message_types'] as $imt) { |
|
1458 | + if ($imt instanceof EE_message_type) { |
|
1459 | 1459 | $installed_mts[$imt->name] = $imt; |
1460 | 1460 | } |
1461 | 1461 | } |
1462 | 1462 | |
1463 | 1463 | //now let's loop through the active array and validate |
1464 | - foreach( $active_messengers as $messenger => $active_details ) { |
|
1464 | + foreach ($active_messengers as $messenger => $active_details) { |
|
1465 | 1465 | //first let's see if this messenger is installed. |
1466 | - if ( ! isset( $installed_messengers[$messenger] ) ) { |
|
1466 | + if ( ! isset($installed_messengers[$messenger])) { |
|
1467 | 1467 | //not set so let's just remove from actives and make sure templates are inactive. |
1468 | - unset( $active_messengers[$messenger] ); |
|
1469 | - EEH_MSG_Template::update_to_inactive( $messenger ); |
|
1468 | + unset($active_messengers[$messenger]); |
|
1469 | + EEH_MSG_Template::update_to_inactive($messenger); |
|
1470 | 1470 | continue; |
1471 | 1471 | } |
1472 | 1472 | |
1473 | 1473 | //messenger is active, so let's just make sure that any active message types not installed are deactivated. |
1474 | - $mts = ! empty( $active_details['settings'][$messenger . '-message_types'] ) ? $active_details['settings'][$messenger . '-message_types'] : array(); |
|
1475 | - foreach ( $mts as $mt_name => $mt ) { |
|
1476 | - if ( ! isset( $installed_mts[$mt_name] ) ) { |
|
1477 | - unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] ); |
|
1478 | - EEH_MSG_Template::update_to_inactive( $messenger, $mt_name ); |
|
1474 | + $mts = ! empty($active_details['settings'][$messenger.'-message_types']) ? $active_details['settings'][$messenger.'-message_types'] : array(); |
|
1475 | + foreach ($mts as $mt_name => $mt) { |
|
1476 | + if ( ! isset($installed_mts[$mt_name])) { |
|
1477 | + unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt_name]); |
|
1478 | + EEH_MSG_Template::update_to_inactive($messenger, $mt_name); |
|
1479 | 1479 | } |
1480 | 1480 | } |
1481 | 1481 | } |
1482 | 1482 | |
1483 | 1483 | //all done! let's update the active_messengers. |
1484 | - EEH_MSG_Template::update_active_messengers_in_db( $active_messengers ); |
|
1485 | - do_action( 'AHEE__EEH_Activation__validate_messages_system' ); |
|
1484 | + EEH_MSG_Template::update_active_messengers_in_db($active_messengers); |
|
1485 | + do_action('AHEE__EEH_Activation__validate_messages_system'); |
|
1486 | 1486 | return; |
1487 | 1487 | } |
1488 | 1488 | |
@@ -1496,12 +1496,12 @@ discard block |
||
1496 | 1496 | * @static |
1497 | 1497 | * @return void |
1498 | 1498 | */ |
1499 | - public static function create_no_ticket_prices_array(){ |
|
1499 | + public static function create_no_ticket_prices_array() { |
|
1500 | 1500 | // this creates an array for tracking events that have no active ticket prices created |
1501 | 1501 | // this allows us to warn admins of the situation so that it can be corrected |
1502 | - $espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', FALSE ); |
|
1503 | - if ( ! $espresso_no_ticket_prices ) { |
|
1504 | - add_option( 'ee_no_ticket_prices', array(), '', FALSE ); |
|
1502 | + $espresso_no_ticket_prices = get_option('ee_no_ticket_prices', FALSE); |
|
1503 | + if ( ! $espresso_no_ticket_prices) { |
|
1504 | + add_option('ee_no_ticket_prices', array(), '', FALSE); |
|
1505 | 1505 | } |
1506 | 1506 | } |
1507 | 1507 | |
@@ -1523,24 +1523,24 @@ discard block |
||
1523 | 1523 | * Finds all our EE4 custom post types, and deletes them and their associated data (like post meta or term relations)/ |
1524 | 1524 | * @global wpdb $wpdb |
1525 | 1525 | */ |
1526 | - public static function delete_all_espresso_cpt_data(){ |
|
1526 | + public static function delete_all_espresso_cpt_data() { |
|
1527 | 1527 | global $wpdb; |
1528 | 1528 | //get all the CPT post_types |
1529 | 1529 | $ee_post_types = array(); |
1530 | - foreach(EE_Registry::instance()->non_abstract_db_models as $model_name){ |
|
1531 | - if ( method_exists( $model_name, 'instance' )) { |
|
1532 | - $model_obj = call_user_func( array( $model_name, 'instance' )); |
|
1533 | - if ( $model_obj instanceof EEM_CPT_Base ) { |
|
1534 | - $ee_post_types[] = $wpdb->prepare("%s",$model_obj->post_type()); |
|
1530 | + foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) { |
|
1531 | + if (method_exists($model_name, 'instance')) { |
|
1532 | + $model_obj = call_user_func(array($model_name, 'instance')); |
|
1533 | + if ($model_obj instanceof EEM_CPT_Base) { |
|
1534 | + $ee_post_types[] = $wpdb->prepare("%s", $model_obj->post_type()); |
|
1535 | 1535 | } |
1536 | 1536 | } |
1537 | 1537 | } |
1538 | 1538 | //get all our CPTs |
1539 | - $query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",",$ee_post_types).")"; |
|
1539 | + $query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",", $ee_post_types).")"; |
|
1540 | 1540 | $cpt_ids = $wpdb->get_col($query); |
1541 | 1541 | //delete each post meta and term relations too |
1542 | - foreach($cpt_ids as $post_id){ |
|
1543 | - wp_delete_post($post_id,true); |
|
1542 | + foreach ($cpt_ids as $post_id) { |
|
1543 | + wp_delete_post($post_id, true); |
|
1544 | 1544 | } |
1545 | 1545 | } |
1546 | 1546 | |
@@ -1554,18 +1554,18 @@ discard block |
||
1554 | 1554 | * @param bool $remove_all |
1555 | 1555 | * @return void |
1556 | 1556 | */ |
1557 | - public static function delete_all_espresso_tables_and_data( $remove_all = true ) { |
|
1557 | + public static function delete_all_espresso_tables_and_data($remove_all = true) { |
|
1558 | 1558 | global $wpdb; |
1559 | 1559 | $undeleted_tables = array(); |
1560 | 1560 | |
1561 | 1561 | // load registry |
1562 | - foreach( EE_Registry::instance()->non_abstract_db_models as $model_name ){ |
|
1563 | - if ( method_exists( $model_name, 'instance' )) { |
|
1564 | - $model_obj = call_user_func( array( $model_name, 'instance' )); |
|
1565 | - if ( $model_obj instanceof EEM_Base ) { |
|
1566 | - foreach ( $model_obj->get_tables() as $table ) { |
|
1567 | - if ( strpos( $table->get_table_name(), 'esp_' )) { |
|
1568 | - switch ( EEH_Activation::delete_unused_db_table( $table->get_table_name() )) { |
|
1562 | + foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) { |
|
1563 | + if (method_exists($model_name, 'instance')) { |
|
1564 | + $model_obj = call_user_func(array($model_name, 'instance')); |
|
1565 | + if ($model_obj instanceof EEM_Base) { |
|
1566 | + foreach ($model_obj->get_tables() as $table) { |
|
1567 | + if (strpos($table->get_table_name(), 'esp_')) { |
|
1568 | + switch (EEH_Activation::delete_unused_db_table($table->get_table_name())) { |
|
1569 | 1569 | case false : |
1570 | 1570 | $undeleted_tables[] = $table->get_table_name(); |
1571 | 1571 | break; |
@@ -1590,8 +1590,8 @@ discard block |
||
1590 | 1590 | 'esp_promotion_rule', |
1591 | 1591 | 'esp_rule' |
1592 | 1592 | ); |
1593 | - foreach( $tables_without_models as $table ){ |
|
1594 | - EEH_Activation::delete_db_table_if_empty( $table ); |
|
1593 | + foreach ($tables_without_models as $table) { |
|
1594 | + EEH_Activation::delete_db_table_if_empty($table); |
|
1595 | 1595 | } |
1596 | 1596 | |
1597 | 1597 | |
@@ -1629,58 +1629,58 @@ discard block |
||
1629 | 1629 | 'ee_job_parameters_' => false, |
1630 | 1630 | 'ee_upload_directories_incomplete' => true, |
1631 | 1631 | ); |
1632 | - if( is_main_site() ) { |
|
1633 | - $wp_options_to_delete[ 'ee_network_config' ] = true; |
|
1632 | + if (is_main_site()) { |
|
1633 | + $wp_options_to_delete['ee_network_config'] = true; |
|
1634 | 1634 | } |
1635 | 1635 | |
1636 | 1636 | $undeleted_options = array(); |
1637 | - foreach ( $wp_options_to_delete as $option_name => $no_wildcard ) { |
|
1637 | + foreach ($wp_options_to_delete as $option_name => $no_wildcard) { |
|
1638 | 1638 | |
1639 | - if( $no_wildcard ){ |
|
1640 | - if( ! delete_option( $option_name ) ){ |
|
1639 | + if ($no_wildcard) { |
|
1640 | + if ( ! delete_option($option_name)) { |
|
1641 | 1641 | $undeleted_options[] = $option_name; |
1642 | 1642 | } |
1643 | - }else{ |
|
1644 | - $option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" ); |
|
1645 | - foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){ |
|
1646 | - if( ! delete_option( $option_name_from_wildcard ) ){ |
|
1643 | + } else { |
|
1644 | + $option_names_to_delete_from_wildcard = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'"); |
|
1645 | + foreach ($option_names_to_delete_from_wildcard as $option_name_from_wildcard) { |
|
1646 | + if ( ! delete_option($option_name_from_wildcard)) { |
|
1647 | 1647 | $undeleted_options[] = $option_name_from_wildcard; |
1648 | 1648 | } |
1649 | 1649 | } |
1650 | 1650 | } |
1651 | 1651 | } |
1652 | 1652 | //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it |
1653 | - remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 ); |
|
1653 | + remove_action('shutdown', array(EE_Config::instance(), 'shutdown'), 10); |
|
1654 | 1654 | |
1655 | - if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) { |
|
1655 | + if ($remove_all && $espresso_db_update = get_option('espresso_db_update')) { |
|
1656 | 1656 | $db_update_sans_ee4 = array(); |
1657 | - foreach($espresso_db_update as $version => $times_activated){ |
|
1658 | - if( $version[0] =='3'){//if its NON EE4 |
|
1657 | + foreach ($espresso_db_update as $version => $times_activated) { |
|
1658 | + if ($version[0] == '3') {//if its NON EE4 |
|
1659 | 1659 | $db_update_sans_ee4[$version] = $times_activated; |
1660 | 1660 | } |
1661 | 1661 | } |
1662 | - update_option( 'espresso_db_update', $db_update_sans_ee4 ); |
|
1662 | + update_option('espresso_db_update', $db_update_sans_ee4); |
|
1663 | 1663 | } |
1664 | 1664 | |
1665 | 1665 | $errors = ''; |
1666 | - if ( ! empty( $undeleted_tables )) { |
|
1666 | + if ( ! empty($undeleted_tables)) { |
|
1667 | 1667 | $errors .= sprintf( |
1668 | - __( 'The following tables could not be deleted: %s%s', 'event_espresso' ), |
|
1668 | + __('The following tables could not be deleted: %s%s', 'event_espresso'), |
|
1669 | 1669 | '<br/>', |
1670 | - implode( ',<br/>', $undeleted_tables ) |
|
1670 | + implode(',<br/>', $undeleted_tables) |
|
1671 | 1671 | ); |
1672 | 1672 | } |
1673 | - if ( ! empty( $undeleted_options )) { |
|
1674 | - $errors .= ! empty( $undeleted_tables ) ? '<br/>' : ''; |
|
1673 | + if ( ! empty($undeleted_options)) { |
|
1674 | + $errors .= ! empty($undeleted_tables) ? '<br/>' : ''; |
|
1675 | 1675 | $errors .= sprintf( |
1676 | - __( 'The following wp-options could not be deleted: %s%s', 'event_espresso' ), |
|
1676 | + __('The following wp-options could not be deleted: %s%s', 'event_espresso'), |
|
1677 | 1677 | '<br/>', |
1678 | - implode( ',<br/>', $undeleted_options ) |
|
1678 | + implode(',<br/>', $undeleted_options) |
|
1679 | 1679 | ); |
1680 | 1680 | |
1681 | 1681 | } |
1682 | - if ( $errors != '' ) { |
|
1683 | - EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ ); |
|
1682 | + if ($errors != '') { |
|
1683 | + EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__); |
|
1684 | 1684 | } |
1685 | 1685 | } |
1686 | 1686 | |
@@ -1690,23 +1690,23 @@ discard block |
||
1690 | 1690 | * @param string $table_name with or without $wpdb->prefix |
1691 | 1691 | * @return boolean |
1692 | 1692 | */ |
1693 | - public static function table_exists( $table_name ){ |
|
1693 | + public static function table_exists($table_name) { |
|
1694 | 1694 | global $wpdb, $EZSQL_ERROR; |
1695 | - $table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name ); |
|
1695 | + $table_name = EEH_Activation::ensure_table_name_has_prefix($table_name); |
|
1696 | 1696 | //ignore if this causes an sql error |
1697 | 1697 | $old_error = $wpdb->last_error; |
1698 | 1698 | $old_suppress_errors = $wpdb->suppress_errors(); |
1699 | - $old_show_errors_value = $wpdb->show_errors( FALSE ); |
|
1699 | + $old_show_errors_value = $wpdb->show_errors(FALSE); |
|
1700 | 1700 | $ezsql_error_cache = $EZSQL_ERROR; |
1701 | - $wpdb->get_results( "SELECT * from $table_name LIMIT 1"); |
|
1702 | - $wpdb->show_errors( $old_show_errors_value ); |
|
1703 | - $wpdb->suppress_errors( $old_suppress_errors ); |
|
1701 | + $wpdb->get_results("SELECT * from $table_name LIMIT 1"); |
|
1702 | + $wpdb->show_errors($old_show_errors_value); |
|
1703 | + $wpdb->suppress_errors($old_suppress_errors); |
|
1704 | 1704 | $new_error = $wpdb->last_error; |
1705 | 1705 | $wpdb->last_error = $old_error; |
1706 | 1706 | $EZSQL_ERROR = $ezsql_error_cache; |
1707 | - if( empty( $new_error ) ){ |
|
1707 | + if (empty($new_error)) { |
|
1708 | 1708 | return TRUE; |
1709 | - }else{ |
|
1709 | + } else { |
|
1710 | 1710 | return FALSE; |
1711 | 1711 | } |
1712 | 1712 | } |
@@ -1714,7 +1714,7 @@ discard block |
||
1714 | 1714 | /** |
1715 | 1715 | * Resets the cache on EEH_Activation |
1716 | 1716 | */ |
1717 | - public static function reset(){ |
|
1717 | + public static function reset() { |
|
1718 | 1718 | self::$_default_creator_id = NULL; |
1719 | 1719 | self::$_initialized_db_content_already_in_this_request = false; |
1720 | 1720 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <tr> |
29 | - <th><h3><?php _e("Invoice Gateway Settings", 'event_espresso');?></h3></th> |
|
29 | + <th><h3><?php _e("Invoice Gateway Settings", 'event_espresso'); ?></h3></th> |
|
30 | 30 | <td> |
31 | - <span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso');?></span> |
|
31 | + <span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso'); ?></span> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <?php |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <tr> |
29 | - <th><h3><?php _e("Invoice Display Settings", 'event_espresso');?></h3></th> |
|
29 | + <th><h3><?php _e("Invoice Display Settings", 'event_espresso'); ?></h3></th> |
|
30 | 30 | <td> |
31 | - <span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso');?></span> |
|
31 | + <span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso'); ?></span> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <?php |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | * @return boolean |
16 | 16 | */ |
17 | 17 | function ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() { |
18 | - $in_use = has_filter( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns' ) |
|
19 | - || has_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save' ); |
|
20 | - if( $in_use ) { |
|
18 | + $in_use = has_filter('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns') |
|
19 | + || has_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save'); |
|
20 | + if ($in_use) { |
|
21 | 21 | $msg = __( |
22 | 22 | 'We detected you are using the filter FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns or AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save.' |
23 | 23 | . 'Both of these have been deprecated and should not be used anymore. You should instead use FHEE__EE_Form_Section_Proper___construct__options_array to customize the contents of the form,' |
@@ -26,18 +26,18 @@ discard block |
||
26 | 26 | 'event_espresso' ) |
27 | 27 | ; |
28 | 28 | EE_Error::doing_it_wrong( |
29 | - __CLASS__ . '::' . __FUNCTION__, |
|
29 | + __CLASS__.'::'.__FUNCTION__, |
|
30 | 30 | $msg, |
31 | 31 | '4.8.32.rc.000' |
32 | 32 | ); |
33 | 33 | //it seems the doing_it_wrong messages get output during some hidden html tags, so add an error to make sure this gets noticed |
34 | - if ( is_admin() && ! defined( 'DOING_AJAX' ) ) { |
|
35 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
34 | + if (is_admin() && ! defined('DOING_AJAX')) { |
|
35 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | return $in_use; |
39 | 39 | } |
40 | -add_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks' ); |
|
40 | +add_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks'); |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @deprecated since 4.8.32.rc.000 because it has issues on https://events.codebasehq.com/projects/event-espresso/tickets/9165 |
@@ -46,34 +46,34 @@ discard block |
||
46 | 46 | * @param EE_Admin_Page $admin_page |
47 | 47 | * @return void |
48 | 48 | */ |
49 | -function ee_deprecated_update_attendee_registration_form_old( $admin_page ) { |
|
49 | +function ee_deprecated_update_attendee_registration_form_old($admin_page) { |
|
50 | 50 | //check if the old hooks are in use. If not, do the default |
51 | - if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
52 | - || ! $admin_page instanceof EE_Admin_Page ) { |
|
51 | + if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
52 | + || ! $admin_page instanceof EE_Admin_Page) { |
|
53 | 53 | return; |
54 | 54 | } |
55 | 55 | $req_data = $admin_page->get_request_data(); |
56 | - $qstns = isset( $req_data['qstn'] ) ? $req_data['qstn'] : FALSE; |
|
57 | - $REG_ID = isset( $req_data['_REG_ID'] ) ? absint( $req_data['_REG_ID'] ) : FALSE; |
|
58 | - $qstns = apply_filters( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns ); |
|
59 | - if ( ! $REG_ID || ! $qstns ) { |
|
60 | - EE_Error::add_error( __('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
56 | + $qstns = isset($req_data['qstn']) ? $req_data['qstn'] : FALSE; |
|
57 | + $REG_ID = isset($req_data['_REG_ID']) ? absint($req_data['_REG_ID']) : FALSE; |
|
58 | + $qstns = apply_filters('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns); |
|
59 | + if ( ! $REG_ID || ! $qstns) { |
|
60 | + EE_Error::add_error(__('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
61 | 61 | } |
62 | 62 | $success = TRUE; |
63 | 63 | |
64 | 64 | // allow others to get in on this awesome fun :D |
65 | - do_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns ); |
|
65 | + do_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns); |
|
66 | 66 | // loop thru questions... FINALLY!!! |
67 | 67 | |
68 | - foreach ( $qstns as $QST_ID => $qstn ) { |
|
68 | + foreach ($qstns as $QST_ID => $qstn) { |
|
69 | 69 | //if $qstn isn't an array then it doesn't already have an answer, so let's create the answer |
70 | - if ( !is_array($qstn) ) { |
|
71 | - $success = $this->_save_new_answer( $REG_ID, $QST_ID, $qstn); |
|
70 | + if ( ! is_array($qstn)) { |
|
71 | + $success = $this->_save_new_answer($REG_ID, $QST_ID, $qstn); |
|
72 | 72 | continue; |
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | - foreach ( $qstn as $ANS_ID => $ANS_value ) { |
|
76 | + foreach ($qstn as $ANS_ID => $ANS_value) { |
|
77 | 77 | //get answer |
78 | 78 | $query_params = array( |
79 | 79 | 0 => array( |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | ); |
85 | 85 | $answer = EEM_Answer::instance()->get_one($query_params); |
86 | 86 | //this MAY be an array but NOT have an answer because its multi select. If so then we need to create the answer |
87 | - if ( ! $answer instanceof EE_Answer ) { |
|
87 | + if ( ! $answer instanceof EE_Answer) { |
|
88 | 88 | $set_values = array( |
89 | 89 | 'QST_ID' => $QST_ID, |
90 | 90 | 'REG_ID' => $REG_ID, |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | } |
100 | 100 | } |
101 | 101 | $what = __('Registration Form', 'event_espresso'); |
102 | - $route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' ); |
|
103 | - $admin_page->redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route ); |
|
102 | + $route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default'); |
|
103 | + $admin_page->redirect_after_action($success, $what, __('updated', 'event_espresso'), $route); |
|
104 | 104 | exit; |
105 | 105 | } |
106 | -add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 ); |
|
106 | +add_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1); |
|
107 | 107 | /** |
108 | 108 | * Render the registration admin page's custom questions area in the old fashion |
109 | 109 | * and firing the old hooks. When this method is removed, we can probably also |
@@ -116,31 +116,31 @@ discard block |
||
116 | 116 | * @return bool |
117 | 117 | * @throws \EE_Error |
118 | 118 | */ |
119 | -function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) { |
|
119 | +function ee_deprecated_reg_questions_meta_box_old($do_default_action, $admin_page, $registration) { |
|
120 | 120 | //check if the old hooks are in use. If not, do the default |
121 | - if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
122 | - || ! $admin_page instanceof EE_Admin_Page ) { |
|
121 | + if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
122 | + || ! $admin_page instanceof EE_Admin_Page) { |
|
123 | 123 | return $do_default_action; |
124 | 124 | } |
125 | - add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array( $admin_page, 'form_before_question_group' ), 10, 1 ); |
|
126 | - add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array( $admin_page, 'form_after_question_group' ), 10, 1 ); |
|
127 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $admin_page, 'form_form_field_label_wrap' ), 10, 1 ); |
|
128 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $admin_page, 'form_form_field_input__wrap' ), 10, 1 ); |
|
125 | + add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array($admin_page, 'form_before_question_group'), 10, 1); |
|
126 | + add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array($admin_page, 'form_after_question_group'), 10, 1); |
|
127 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($admin_page, 'form_form_field_label_wrap'), 10, 1); |
|
128 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($admin_page, 'form_form_field_input__wrap'), 10, 1); |
|
129 | 129 | |
130 | - $question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options( $registration, $registration->get('EVT_ID') ); |
|
130 | + $question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options($registration, $registration->get('EVT_ID')); |
|
131 | 131 | |
132 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
132 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
133 | 133 | $template_args = array( |
134 | - 'att_questions' => EEH_Form_Fields::generate_question_groups_html( $question_groups ), |
|
134 | + 'att_questions' => EEH_Form_Fields::generate_question_groups_html($question_groups), |
|
135 | 135 | 'reg_questions_form_action' => 'edit_registration', |
136 | 136 | 'REG_ID' => $registration->ID() |
137 | 137 | ); |
138 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
139 | - echo EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
138 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
139 | + echo EEH_Template::display_template($template_path, $template_args, TRUE); |
|
140 | 140 | //indicate that we should not do the default admin page code |
141 | 141 | return false; |
142 | 142 | } |
143 | -add_action( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3 ); |
|
143 | +add_action('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3); |
|
144 | 144 | |
145 | 145 | /** |
146 | 146 | * ee_deprecated__registration_checkout__button_text |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @param \EE_Checkout $checkout |
150 | 150 | * @return string |
151 | 151 | */ |
152 | -function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) { |
|
152 | +function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) { |
|
153 | 153 | // list of old filters |
154 | 154 | $deprecated_filters = array( |
155 | 155 | 'update_registration_details' => true, |
@@ -159,16 +159,16 @@ discard block |
||
159 | 159 | 'proceed_to' => true, |
160 | 160 | ); |
161 | 161 | // loop thru and call doing_it_wrong() or remove any that aren't being used |
162 | - foreach ( $deprecated_filters as $deprecated_filter => $on ) { |
|
162 | + foreach ($deprecated_filters as $deprecated_filter => $on) { |
|
163 | 163 | // was this filter called ? |
164 | - if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) { |
|
164 | + if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) { |
|
165 | 165 | // only display doing_it_wrong() notice to Event Admins during non-AJAX requests |
166 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) { |
|
166 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) { |
|
167 | 167 | EE_Error::doing_it_wrong( |
168 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
168 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
169 | 169 | sprintf( |
170 | - __( 'The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ), |
|
171 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
170 | + __('The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'), |
|
171 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
172 | 172 | '<br />', |
173 | 173 | 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', |
174 | 174 | '/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php' |
@@ -178,24 +178,24 @@ discard block |
||
178 | 178 | ); |
179 | 179 | } |
180 | 180 | } else { |
181 | - unset( $deprecated_filters[ $deprecated_filter ] ); |
|
181 | + unset($deprecated_filters[$deprecated_filter]); |
|
182 | 182 | } |
183 | 183 | } |
184 | - if ( ! empty( $deprecated_filters )) { |
|
185 | - |
|
186 | - if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) { |
|
187 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text ); |
|
188 | - } else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) { |
|
189 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text ); |
|
190 | - } else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) { |
|
191 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text ); |
|
184 | + if ( ! empty($deprecated_filters)) { |
|
185 | + |
|
186 | + if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) { |
|
187 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text); |
|
188 | + } else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) { |
|
189 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text); |
|
190 | + } else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) { |
|
191 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text); |
|
192 | 192 | } |
193 | - if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) { |
|
194 | - if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) { |
|
195 | - $submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text ); |
|
193 | + if ($checkout->next_step instanceof EE_SPCO_Reg_Step) { |
|
194 | + if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) { |
|
195 | + $submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text); |
|
196 | 196 | } |
197 | - if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) { |
|
198 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name(); |
|
197 | + if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) { |
|
198 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name(); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | return $submit_button_text; |
204 | 204 | |
205 | 205 | } |
206 | -add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 ); |
|
206 | +add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2); |
|
207 | 207 | |
208 | 208 | |
209 | 209 | |
@@ -214,16 +214,16 @@ discard block |
||
214 | 214 | * @param \EE_Checkout $checkout |
215 | 215 | * @param boolean $status_updates |
216 | 216 | */ |
217 | -function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) { |
|
217 | +function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) { |
|
218 | 218 | $action_ref = NULL; |
219 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
220 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
221 | - if ( $action_ref ) { |
|
219 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
220 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
221 | + if ($action_ref) { |
|
222 | 222 | |
223 | 223 | EE_Error::doing_it_wrong( |
224 | 224 | $action_ref, |
225 | 225 | sprintf( |
226 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ), |
|
226 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'), |
|
227 | 227 | '<br />', |
228 | 228 | '/core/business/EE_Transaction_Processor.class.php', |
229 | 229 | 'AHEE__EE_Transaction_Processor__finalize', |
@@ -234,29 +234,29 @@ discard block |
||
234 | 234 | '4.6.0', |
235 | 235 | E_USER_DEPRECATED |
236 | 236 | ); |
237 | - switch ( $action_ref ) { |
|
237 | + switch ($action_ref) { |
|
238 | 238 | case 'AHEE__EE_Transaction__finalize__new_transaction' : |
239 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request ); |
|
239 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request); |
|
240 | 240 | break; |
241 | 241 | case 'AHEE__EE_Transaction__finalize__all_transaction' : |
242 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request ); |
|
242 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request); |
|
243 | 243 | break; |
244 | 244 | } |
245 | 245 | } |
246 | 246 | } |
247 | -add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
|
247 | +add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2); |
|
248 | 248 | /** |
249 | 249 | * ee_deprecated_finalize_registration |
250 | 250 | * |
251 | 251 | * @param EE_Registration $registration |
252 | 252 | */ |
253 | -function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
|
254 | - $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
255 | - if ( $action_ref ) { |
|
253 | +function ee_deprecated_finalize_registration(EE_Registration $registration) { |
|
254 | + $action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
255 | + if ($action_ref) { |
|
256 | 256 | EE_Error::doing_it_wrong( |
257 | 257 | $action_ref, |
258 | 258 | sprintf( |
259 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ), |
|
259 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'), |
|
260 | 260 | '<br />', |
261 | 261 | '/core/business/EE_Registration_Processor.class.php', |
262 | 262 | 'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook' |
@@ -264,10 +264,10 @@ discard block |
||
264 | 264 | '4.6.0', |
265 | 265 | E_USER_DEPRECATED |
266 | 266 | ); |
267 | - do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ))); |
|
267 | + do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX))); |
|
268 | 268 | } |
269 | 269 | } |
270 | -add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 ); |
|
270 | +add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1); |
|
271 | 271 | |
272 | 272 | |
273 | 273 | |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | * |
289 | 289 | * @return array |
290 | 290 | */ |
291 | -function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) { |
|
291 | +function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) { |
|
292 | 292 | $old_default_classnames = array( |
293 | 293 | 'EE_Messages_Email_Cancelled_Registration_Defaults', |
294 | 294 | 'EE_Messages_Email_Declined_Registration_Defaults', |
@@ -304,23 +304,23 @@ discard block |
||
304 | 304 | |
305 | 305 | $old_class_instance = new stdClass(); |
306 | 306 | |
307 | - foreach ( $old_default_classnames as $classname ) { |
|
308 | - $filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates'; |
|
309 | - if ( has_filter( $filter_ref ) ) { |
|
310 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
307 | + foreach ($old_default_classnames as $classname) { |
|
308 | + $filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates'; |
|
309 | + if (has_filter($filter_ref)) { |
|
310 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
311 | 311 | } |
312 | - $templates = apply_filters( $filter_ref, $templates, $old_class_instance ); |
|
312 | + $templates = apply_filters($filter_ref, $templates, $old_class_instance); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | return $templates; |
316 | 316 | } |
317 | -add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 ); |
|
317 | +add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4); |
|
318 | 318 | |
319 | 319 | /** |
320 | 320 | * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called. |
321 | 321 | * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately. |
322 | 322 | */ |
323 | -function ee_deprecated_hooks(){ |
|
323 | +function ee_deprecated_hooks() { |
|
324 | 324 | /** |
325 | 325 | * @var $hooks array where keys are hook names, and their values are array{ |
326 | 326 | * @type string $version when deprecated |
@@ -331,26 +331,26 @@ discard block |
||
331 | 331 | $hooks = array( |
332 | 332 | 'AHEE__EE_System___do_setup_validations' => array( |
333 | 333 | 'version' => '4.6.0', |
334 | - 'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ), |
|
334 | + 'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'), |
|
335 | 335 | 'still_works' => FALSE |
336 | 336 | ) |
337 | 337 | ); |
338 | - foreach( $hooks as $name => $deprecation_info ){ |
|
339 | - if( has_action( $name ) ){ |
|
338 | + foreach ($hooks as $name => $deprecation_info) { |
|
339 | + if (has_action($name)) { |
|
340 | 340 | EE_Error::doing_it_wrong( |
341 | 341 | $name, |
342 | 342 | sprintf( |
343 | - __('This filter is deprecated. %1$s%2$s','event_espresso'), |
|
344 | - $deprecation_info[ 'still_works' ] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ), |
|
345 | - isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' ) |
|
343 | + __('This filter is deprecated. %1$s%2$s', 'event_espresso'), |
|
344 | + $deprecation_info['still_works'] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'), |
|
345 | + isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso') |
|
346 | 346 | ), |
347 | - isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' ), |
|
347 | + isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso'), |
|
348 | 348 | E_USER_DEPRECATED |
349 | 349 | ); |
350 | 350 | } |
351 | 351 | } |
352 | 352 | } |
353 | -add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' ); |
|
353 | +add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks'); |
|
354 | 354 | |
355 | 355 | |
356 | 356 | |
@@ -373,25 +373,25 @@ discard block |
||
373 | 373 | * |
374 | 374 | * @return string The default contents for the messenger, message type, context and field. |
375 | 375 | */ |
376 | -function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) { |
|
376 | +function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) { |
|
377 | 377 | |
378 | 378 | $classnames_to_try = array( |
379 | - get_class( $messenger ) => $messenger, |
|
380 | - get_class( $message_type ) => $message_type, |
|
379 | + get_class($messenger) => $messenger, |
|
380 | + get_class($message_type) => $message_type, |
|
381 | 381 | 'EE_Messages_Base' => $message_type |
382 | 382 | ); |
383 | 383 | |
384 | - foreach ( $classnames_to_try as $classname => $obj ) { |
|
385 | - $filter_ref = 'FHEE__' . $classname . '__get_default_field_content'; |
|
386 | - if ( has_filter( $filter_ref ) ) { |
|
387 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
384 | + foreach ($classnames_to_try as $classname => $obj) { |
|
385 | + $filter_ref = 'FHEE__'.$classname.'__get_default_field_content'; |
|
386 | + if (has_filter($filter_ref)) { |
|
387 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
388 | 388 | } |
389 | - $contents = apply_filters( $filter_ref, $contents, $obj ); |
|
389 | + $contents = apply_filters($filter_ref, $contents, $obj); |
|
390 | 390 | } |
391 | 391 | |
392 | 392 | return $contents; |
393 | 393 | } |
394 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 ); |
|
394 | +add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7); |
|
395 | 395 | |
396 | 396 | |
397 | 397 | |
@@ -419,23 +419,23 @@ discard block |
||
419 | 419 | * |
420 | 420 | * @return string The path to the file being used. |
421 | 421 | */ |
422 | -function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) { |
|
422 | +function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) { |
|
423 | 423 | |
424 | - if ( $messenger == 'email' ) { |
|
424 | + if ($messenger == 'email') { |
|
425 | 425 | $filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path'; |
426 | - } elseif ( $messenger == 'html' ) { |
|
426 | + } elseif ($messenger == 'html') { |
|
427 | 427 | $filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path'; |
428 | 428 | } else { |
429 | 429 | return $variation_path; |
430 | 430 | } |
431 | 431 | |
432 | - if ( has_filter( $filter_ref ) ) { |
|
433 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
432 | + if (has_filter($filter_ref)) { |
|
433 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
434 | 434 | } |
435 | 435 | |
436 | - return apply_filters( $filter_ref, $variation_path, $url, $type ); |
|
436 | + return apply_filters($filter_ref, $variation_path, $url, $type); |
|
437 | 437 | } |
438 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 ); |
|
438 | +add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8); |
|
439 | 439 | |
440 | 440 | |
441 | 441 | |
@@ -451,78 +451,78 @@ discard block |
||
451 | 451 | class EE_Messages_Init extends EE_Base { |
452 | 452 | |
453 | 453 | public function __construct() { |
454 | - self::doing_it_wrong_call( __METHOD__ ); |
|
454 | + self::doing_it_wrong_call(__METHOD__); |
|
455 | 455 | } |
456 | 456 | |
457 | 457 | /** |
458 | 458 | * @param $method_name |
459 | 459 | */ |
460 | - public static function doing_it_wrong_call( $method_name ) { |
|
461 | - EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED ); |
|
460 | + public static function doing_it_wrong_call($method_name) { |
|
461 | + EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0', E_USER_DEPRECATED); |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | /** |
465 | 465 | * @deprecated 4.5.0 |
466 | 466 | */ |
467 | 467 | public static function set_autoloaders() { |
468 | - self::doing_it_wrong_call( __METHOD__ ); |
|
468 | + self::doing_it_wrong_call(__METHOD__); |
|
469 | 469 | EED_Messages::set_autoloaders(); |
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
473 | 473 | * @deprecated 4.5.0 |
474 | 474 | */ |
475 | - public function payment_reminder( $transaction ) { |
|
476 | - self::doing_it_wrong_call( __METHOD__ ); |
|
477 | - EED_Messages::payment_reminder( $transaction ); |
|
475 | + public function payment_reminder($transaction) { |
|
476 | + self::doing_it_wrong_call(__METHOD__); |
|
477 | + EED_Messages::payment_reminder($transaction); |
|
478 | 478 | } |
479 | 479 | |
480 | 480 | /** |
481 | 481 | * @deprecated 4.5.0 |
482 | 482 | */ |
483 | - public function payment( $transaction, $payment ) { |
|
484 | - self::doing_it_wrong_call( __METHOD__ ); |
|
485 | - EED_Messages::payment( $transaction, $payment ); |
|
483 | + public function payment($transaction, $payment) { |
|
484 | + self::doing_it_wrong_call(__METHOD__); |
|
485 | + EED_Messages::payment($transaction, $payment); |
|
486 | 486 | } |
487 | 487 | |
488 | 488 | /** |
489 | 489 | * @deprecated 4.5.0 |
490 | 490 | */ |
491 | - public function cancelled_registration( $transaction ) { |
|
492 | - self::doing_it_wrong_call( __METHOD__ ); |
|
493 | - EED_Messages::cancelled_registration( $transaction ); |
|
491 | + public function cancelled_registration($transaction) { |
|
492 | + self::doing_it_wrong_call(__METHOD__); |
|
493 | + EED_Messages::cancelled_registration($transaction); |
|
494 | 494 | } |
495 | 495 | |
496 | 496 | /** |
497 | 497 | * @deprecated 4.5.0 |
498 | 498 | */ |
499 | - public function maybe_registration( $transaction, $reg_msg, $from_admin ) { |
|
500 | - self::doing_it_wrong_call( __METHOD__ ); |
|
501 | - EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin ); |
|
499 | + public function maybe_registration($transaction, $reg_msg, $from_admin) { |
|
500 | + self::doing_it_wrong_call(__METHOD__); |
|
501 | + EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin); |
|
502 | 502 | } |
503 | 503 | |
504 | 504 | /** |
505 | 505 | * @deprecated 4.5.0 |
506 | 506 | */ |
507 | - public function process_resend( $success, $req_data ) { |
|
508 | - self::doing_it_wrong_call( __METHOD__ ); |
|
509 | - EED_Messages::process_resend( $req_data ); |
|
507 | + public function process_resend($success, $req_data) { |
|
508 | + self::doing_it_wrong_call(__METHOD__); |
|
509 | + EED_Messages::process_resend($req_data); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | /** |
513 | 513 | * @deprecated 4.5.0 |
514 | 514 | */ |
515 | - public function process_admin_payment( $success, $payment ) { |
|
516 | - self::doing_it_wrong_call( __METHOD__ ); |
|
517 | - EED_Messages::process_admin_payment( $success, $payment ); |
|
515 | + public function process_admin_payment($success, $payment) { |
|
516 | + self::doing_it_wrong_call(__METHOD__); |
|
517 | + EED_Messages::process_admin_payment($success, $payment); |
|
518 | 518 | } |
519 | 519 | |
520 | 520 | /** |
521 | 521 | * @deprecated 4.5.0 |
522 | 522 | */ |
523 | - public function send_newsletter_message( $contacts, $grp_id ) { |
|
524 | - self::doing_it_wrong_call( __METHOD__ ); |
|
525 | - EED_Messages::send_newsletter_message( $contacts, $grp_id ); |
|
523 | + public function send_newsletter_message($contacts, $grp_id) { |
|
524 | + self::doing_it_wrong_call(__METHOD__); |
|
525 | + EED_Messages::send_newsletter_message($contacts, $grp_id); |
|
526 | 526 | } |
527 | 527 | |
528 | 528 | |
@@ -543,13 +543,13 @@ discard block |
||
543 | 543 | * |
544 | 544 | * @return array additional cpts. |
545 | 545 | */ |
546 | -function ee_deprecated_get_cpts( $cpts ) { |
|
547 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) { |
|
548 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
546 | +function ee_deprecated_get_cpts($cpts) { |
|
547 | + if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) { |
|
548 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
549 | 549 | } |
550 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts ); |
|
550 | + return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts); |
|
551 | 551 | } |
552 | -add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 ); |
|
552 | +add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10); |
|
553 | 553 | |
554 | 554 | |
555 | 555 | |
@@ -563,10 +563,10 @@ discard block |
||
563 | 563 | * |
564 | 564 | * @return array additional custom taxonomies. |
565 | 565 | */ |
566 | -function ee_deprecated_get_taxonomies( $cts ) { |
|
567 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) { |
|
568 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
566 | +function ee_deprecated_get_taxonomies($cts) { |
|
567 | + if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) { |
|
568 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
569 | 569 | } |
570 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts ); |
|
570 | + return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts); |
|
571 | 571 | } |
572 | -add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 ); |
|
572 | +add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10); |
@@ -105,17 +105,17 @@ discard block |
||
105 | 105 | } |
106 | 106 | add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 ); |
107 | 107 | /** |
108 | - * Render the registration admin page's custom questions area in the old fashion |
|
109 | - * and firing the old hooks. When this method is removed, we can probably also |
|
110 | - * remove the deprecated methods form_before_question_group, form_after_question_group, |
|
111 | - * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page |
|
112 | - * |
|
113 | - * @param boolean $do_default_action |
|
114 | - * @param EE_Admin_Page $admin_page |
|
115 | - * @param EE_Registration $registration |
|
116 | - * @return bool |
|
117 | - * @throws \EE_Error |
|
118 | - */ |
|
108 | + * Render the registration admin page's custom questions area in the old fashion |
|
109 | + * and firing the old hooks. When this method is removed, we can probably also |
|
110 | + * remove the deprecated methods form_before_question_group, form_after_question_group, |
|
111 | + * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page |
|
112 | + * |
|
113 | + * @param boolean $do_default_action |
|
114 | + * @param EE_Admin_Page $admin_page |
|
115 | + * @param EE_Registration $registration |
|
116 | + * @return bool |
|
117 | + * @throws \EE_Error |
|
118 | + */ |
|
119 | 119 | function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) { |
120 | 120 | //check if the old hooks are in use. If not, do the default |
121 | 121 | if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | } |
247 | 247 | add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
248 | 248 | /** |
249 | - * ee_deprecated_finalize_registration |
|
250 | - * |
|
251 | - * @param EE_Registration $registration |
|
252 | - */ |
|
249 | + * ee_deprecated_finalize_registration |
|
250 | + * |
|
251 | + * @param EE_Registration $registration |
|
252 | + */ |
|
253 | 253 | function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
254 | 254 | $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
255 | 255 | if ( $action_ref ) { |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | |
137 | 137 | /** |
138 | 138 | * grab url requests and route them |
139 | - * @access private |
|
140 | - * @return void |
|
141 | - */ |
|
139 | + * @access private |
|
140 | + * @return void |
|
141 | + */ |
|
142 | 142 | public function _set_page_routes() { |
143 | 143 | |
144 | 144 | $this->_get_registration_status_array(); |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | 'title' => __('Registrations Other', 'event_espresso'), |
405 | 405 | 'filename' => 'registrations_overview_other' |
406 | 406 | ) |
407 | - ), |
|
407 | + ), |
|
408 | 408 | 'help_tour' => array( 'Registration_Overview_Help_Tour' ), |
409 | 409 | 'qtips' => array('Registration_List_Table_Tips'), |
410 | 410 | 'list_table' => 'EE_Registrations_List_Table', |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | 'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
419 | 419 | 'persistent' => FALSE |
420 | 420 | ), |
421 | - 'help_tabs' => array( |
|
421 | + 'help_tabs' => array( |
|
422 | 422 | 'registrations_details_help_tab' => array( |
423 | 423 | 'title' => __('Registration Details', 'event_espresso'), |
424 | 424 | 'filename' => 'registrations_details' |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | 'order' => 20 |
483 | 483 | ), |
484 | 484 | 'list_table' => 'EE_Attendee_Contact_List_Table', |
485 | - 'help_tabs' => array( |
|
485 | + 'help_tabs' => array( |
|
486 | 486 | 'registrations_contact_list_help_tab' => array( |
487 | 487 | 'title' => __('Registrations Contact List', 'event_espresso'), |
488 | 488 | 'filename' => 'registrations_contact_list' |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | 'title' => __('Contact List Other', 'event_espresso'), |
500 | 500 | 'filename' => 'registrations_contact_list_other' |
501 | 501 | ) |
502 | - ), |
|
502 | + ), |
|
503 | 503 | 'help_tour' => array( 'Contact_List_Help_Tour' ), |
504 | 504 | 'metaboxes' => array(), |
505 | 505 | 'require_nonce' => FALSE |
@@ -533,9 +533,9 @@ discard block |
||
533 | 533 | |
534 | 534 | /** |
535 | 535 | * get list of registration statuses |
536 | - * @access private |
|
537 | - * @return void |
|
538 | - */ |
|
536 | + * @access private |
|
537 | + * @return void |
|
538 | + */ |
|
539 | 539 | private function _get_registration_status_array() { |
540 | 540 | self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE); |
541 | 541 | } |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | return TRUE; |
843 | 843 | } |
844 | 844 | |
845 | - $REG = EEM_Registration::instance(); |
|
845 | + $REG = EEM_Registration::instance(); |
|
846 | 846 | |
847 | 847 | $REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE; |
848 | 848 | |
@@ -1065,9 +1065,9 @@ discard block |
||
1065 | 1065 | |
1066 | 1066 | /** |
1067 | 1067 | * generates HTML for the View Registration Details Admin page |
1068 | - * @access protected |
|
1069 | - * @return void |
|
1070 | - */ |
|
1068 | + * @access protected |
|
1069 | + * @return void |
|
1070 | + */ |
|
1071 | 1071 | protected function _registration_details() { |
1072 | 1072 | |
1073 | 1073 | $this->_template_args = array(); |
@@ -1145,9 +1145,9 @@ discard block |
||
1145 | 1145 | |
1146 | 1146 | /** |
1147 | 1147 | * _set_approve_or_decline_reg_status_buttons |
1148 | - * @access protected |
|
1149 | - * @return string |
|
1150 | - */ |
|
1148 | + * @access protected |
|
1149 | + * @return string |
|
1150 | + */ |
|
1151 | 1151 | public function set_reg_status_buttons_metabox() { |
1152 | 1152 | |
1153 | 1153 | //is registration for free event OR for a completed transaction? This will determine whether the set to pending option is shown. |
@@ -1337,10 +1337,10 @@ discard block |
||
1337 | 1337 | |
1338 | 1338 | /** |
1339 | 1339 | * approve_registration |
1340 | - * @access protected |
|
1341 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1342 | - * @return void |
|
1343 | - */ |
|
1340 | + * @access protected |
|
1341 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1342 | + * @return void |
|
1343 | + */ |
|
1344 | 1344 | protected function approve_registration( $notify = false ) { |
1345 | 1345 | $this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify ); |
1346 | 1346 | } |
@@ -1350,10 +1350,10 @@ discard block |
||
1350 | 1350 | |
1351 | 1351 | /** |
1352 | 1352 | * decline_registration |
1353 | - * @access protected |
|
1354 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1355 | - * @return void |
|
1356 | - */ |
|
1353 | + * @access protected |
|
1354 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1355 | + * @return void |
|
1356 | + */ |
|
1357 | 1357 | protected function decline_registration( $notify = false ) { |
1358 | 1358 | $this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify ); |
1359 | 1359 | } |
@@ -1363,10 +1363,10 @@ discard block |
||
1363 | 1363 | |
1364 | 1364 | /** |
1365 | 1365 | * cancel_registration |
1366 | - * @access protected |
|
1367 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1368 | - * @return void |
|
1369 | - */ |
|
1366 | + * @access protected |
|
1367 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1368 | + * @return void |
|
1369 | + */ |
|
1370 | 1370 | protected function cancel_registration( $notify = false ) { |
1371 | 1371 | $this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify ); |
1372 | 1372 | } |
@@ -1377,10 +1377,10 @@ discard block |
||
1377 | 1377 | |
1378 | 1378 | /** |
1379 | 1379 | * not_approve_registration |
1380 | - * @access protected |
|
1381 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1382 | - * @return void |
|
1383 | - */ |
|
1380 | + * @access protected |
|
1381 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1382 | + * @return void |
|
1383 | + */ |
|
1384 | 1384 | protected function not_approve_registration( $notify = false ) { |
1385 | 1385 | $this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify ); |
1386 | 1386 | } |
@@ -1389,10 +1389,10 @@ discard block |
||
1389 | 1389 | |
1390 | 1390 | /** |
1391 | 1391 | * decline_registration |
1392 | - * @access protected |
|
1393 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1394 | - * @return void |
|
1395 | - */ |
|
1392 | + * @access protected |
|
1393 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1394 | + * @return void |
|
1395 | + */ |
|
1396 | 1396 | protected function pending_registration( $notify = false ) { |
1397 | 1397 | $this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify ); |
1398 | 1398 | } |
@@ -1402,9 +1402,9 @@ discard block |
||
1402 | 1402 | |
1403 | 1403 | /** |
1404 | 1404 | * generates HTML for the Registration main meta box |
1405 | - * @access public |
|
1406 | - * @return void |
|
1407 | - */ |
|
1405 | + * @access public |
|
1406 | + * @return void |
|
1407 | + */ |
|
1408 | 1408 | public function _reg_details_meta_box() { |
1409 | 1409 | EEH_Autoloader::register_line_item_display_autoloaders(); |
1410 | 1410 | EEH_Autoloader::register_line_item_filter_autoloaders(); |
@@ -1487,7 +1487,7 @@ discard block |
||
1487 | 1487 | * |
1488 | 1488 | * @access public |
1489 | 1489 | * @return void |
1490 | - */ |
|
1490 | + */ |
|
1491 | 1491 | public function _reg_questions_meta_box() { |
1492 | 1492 | //allow someone to override this method entirely |
1493 | 1493 | if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) { |
@@ -1689,12 +1689,12 @@ discard block |
||
1689 | 1689 | |
1690 | 1690 | /** |
1691 | 1691 | * generates HTML for the Registration main meta box |
1692 | - * @access public |
|
1693 | - * @return void |
|
1694 | - */ |
|
1692 | + * @access public |
|
1693 | + * @return void |
|
1694 | + */ |
|
1695 | 1695 | public function _reg_attendees_meta_box() { |
1696 | 1696 | |
1697 | - $REG = EEM_Registration::instance(); |
|
1697 | + $REG = EEM_Registration::instance(); |
|
1698 | 1698 | //get all other registrations on this transaction, and cache |
1699 | 1699 | //the attendees for them so we don't have to run another query using force_join |
1700 | 1700 | $registrations = $REG->get_all(array( |
@@ -1747,9 +1747,9 @@ discard block |
||
1747 | 1747 | |
1748 | 1748 | /** |
1749 | 1749 | * generates HTML for the Edit Registration side meta box |
1750 | - * @access public |
|
1751 | - * @return void |
|
1752 | - */ |
|
1750 | + * @access public |
|
1751 | + * @return void |
|
1752 | + */ |
|
1753 | 1753 | public function _reg_registrant_side_meta_box() { |
1754 | 1754 | |
1755 | 1755 | /*@var $attendee EE_Attendee */ |
@@ -2095,9 +2095,9 @@ discard block |
||
2095 | 2095 | |
2096 | 2096 | /** |
2097 | 2097 | * set_reg_event |
2098 | - * @access private |
|
2099 | - * @return boolean |
|
2100 | - */ |
|
2098 | + * @access private |
|
2099 | + * @return boolean |
|
2100 | + */ |
|
2101 | 2101 | private function _set_reg_event() { |
2102 | 2102 | if ( is_object( $this->_reg_event )) { |
2103 | 2103 | return TRUE; |
@@ -2204,9 +2204,9 @@ discard block |
||
2204 | 2204 | |
2205 | 2205 | /** |
2206 | 2206 | * generates HTML for the Attendee Contact List |
2207 | - * @access protected |
|
2208 | - * @return void |
|
2209 | - */ |
|
2207 | + * @access protected |
|
2208 | + * @return void |
|
2209 | + */ |
|
2210 | 2210 | protected function _attendee_contact_list_table() { |
2211 | 2211 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
2212 | 2212 | $this->_search_btn_label = __('Contacts', 'event_espresso'); |
@@ -2220,9 +2220,9 @@ discard block |
||
2220 | 2220 | /** |
2221 | 2221 | * get_attendees |
2222 | 2222 | * @param bool $count whether to return count or data. |
2223 | - * @access public |
|
2224 | - * @return array |
|
2225 | - */ |
|
2223 | + * @access public |
|
2224 | + * @return array |
|
2225 | + */ |
|
2226 | 2226 | public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) { |
2227 | 2227 | |
2228 | 2228 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
@@ -2558,9 +2558,9 @@ discard block |
||
2558 | 2558 | |
2559 | 2559 | /** |
2560 | 2560 | * _attendee_details |
2561 | - * @access protected |
|
2562 | - * @return void |
|
2563 | - */ |
|
2561 | + * @access protected |
|
2562 | + * @return void |
|
2563 | + */ |
|
2564 | 2564 | public function attendee_registrations_meta_box( $post ) { |
2565 | 2565 | |
2566 | 2566 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
@@ -2593,10 +2593,10 @@ discard block |
||
2593 | 2593 | |
2594 | 2594 | /** |
2595 | 2595 | * _trash_or_restore_attendee |
2596 | - * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE) |
|
2597 | - * @access protected |
|
2598 | - * @return void |
|
2599 | - */ |
|
2596 | + * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE) |
|
2597 | + * @access protected |
|
2598 | + * @return void |
|
2599 | + */ |
|
2600 | 2600 | protected function _trash_or_restore_attendees( $trash = TRUE ) { |
2601 | 2601 | |
2602 | 2602 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | * @param bool $routing |
50 | 50 | * @return Registrations_Admin_Page |
51 | 51 | */ |
52 | - public function __construct( $routing = TRUE ) { |
|
53 | - parent::__construct( $routing ); |
|
52 | + public function __construct($routing = TRUE) { |
|
53 | + parent::__construct($routing); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | |
@@ -82,16 +82,16 @@ discard block |
||
82 | 82 | 'trash' => 'post.php' |
83 | 83 | ); |
84 | 84 | |
85 | - add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10 ); |
|
85 | + add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10); |
|
86 | 86 | //add filters so that the comment urls don't take users to a confusing 404 page |
87 | - add_filter('get_comment_link', array( $this, 'clear_comment_link' ), 10, 3 ); |
|
87 | + add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | - public function clear_comment_link( $link, $comment, $args ) { |
|
91 | + public function clear_comment_link($link, $comment, $args) { |
|
92 | 92 | //gotta make sure this only happens on this route |
93 | - $post_type = get_post_type( $comment->comment_post_ID); |
|
94 | - if ( $post_type == 'espresso_attendees' ) |
|
93 | + $post_type = get_post_type($comment->comment_post_ID); |
|
94 | + if ($post_type == 'espresso_attendees') |
|
95 | 95 | return '#commentsdiv'; |
96 | 96 | return $link; |
97 | 97 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | protected function _ajax_hooks() { |
101 | 101 | //todo: all hooks for registrations ajax goes in here |
102 | - add_action( 'wp_ajax_toggle_checkin_status', array( $this, 'toggle_checkin_status' )); |
|
102 | + add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status')); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | 'add-attendee' => __('Add Contact', 'event_espresso'), |
115 | 115 | 'edit' => __('Edit Contact', 'event_espresso'), |
116 | 116 | 'report'=> __("Event Registrations CSV Report", "event_espresso"), |
117 | - 'report_all' => __( 'All Registrations CSV Report', 'event_espresso' ), |
|
118 | - 'contact_list_report' => __( 'Contact List Report', 'event_espresso' ), |
|
117 | + 'report_all' => __('All Registrations CSV Report', 'event_espresso'), |
|
118 | + 'contact_list_report' => __('Contact List Report', 'event_espresso'), |
|
119 | 119 | 'contact_list_export'=> __("Export Data", "event_espresso"), |
120 | 120 | ), |
121 | 121 | 'publishbox' => array( |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | |
144 | 144 | $this->_get_registration_status_array(); |
145 | 145 | |
146 | - $reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0; |
|
147 | - $att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) && ! is_array( $this->_req_data['ATT_ID'] ) ? $this->_req_data['ATT_ID'] : 0; |
|
148 | - $att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id; |
|
146 | + $reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0; |
|
147 | + $att_id = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID']) ? $this->_req_data['ATT_ID'] : 0; |
|
148 | + $att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id; |
|
149 | 149 | |
150 | 150 | $this->_page_routes = array( |
151 | 151 | |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | 'restore_registrations' => array( |
180 | 180 | 'func' => '_trash_or_restore_registrations', |
181 | - 'args' => array( 'trash' => FALSE ), |
|
181 | + 'args' => array('trash' => FALSE), |
|
182 | 182 | 'noheader' => TRUE, |
183 | 183 | 'capability' => 'ee_delete_registrations' |
184 | 184 | ), |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | 'filename' => 'registrations_overview_other' |
406 | 406 | ) |
407 | 407 | ), |
408 | - 'help_tour' => array( 'Registration_Overview_Help_Tour' ), |
|
408 | + 'help_tour' => array('Registration_Overview_Help_Tour'), |
|
409 | 409 | 'qtips' => array('Registration_List_Table_Tips'), |
410 | 410 | 'list_table' => 'EE_Registrations_List_Table', |
411 | 411 | 'require_nonce' => FALSE |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | 'nav' => array( |
416 | 416 | 'label' => __('REG Details', 'event_espresso'), |
417 | 417 | 'order' => 15, |
418 | - 'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
|
418 | + 'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID']), $this->_current_page_view_url) : $this->_admin_base_url, |
|
419 | 419 | 'persistent' => FALSE |
420 | 420 | ), |
421 | 421 | 'help_tabs' => array( |
@@ -436,8 +436,8 @@ discard block |
||
436 | 436 | 'filename' => 'registrations_details_registrant_details' |
437 | 437 | ) |
438 | 438 | ), |
439 | - 'help_tour' => array( 'Registration_Details_Help_Tour' ), |
|
440 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_registration_details_metaboxes' ) ), |
|
439 | + 'help_tour' => array('Registration_Details_Help_Tour'), |
|
440 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_registration_details_metaboxes')), |
|
441 | 441 | 'require_nonce' => FALSE |
442 | 442 | ), |
443 | 443 | |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | 'order' => 15, |
462 | 462 | 'persistent' => FALSE |
463 | 463 | ), |
464 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes' ) ), |
|
464 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes')), |
|
465 | 465 | 'require_nonce' => FALSE |
466 | 466 | ), |
467 | 467 | |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | 'label' => __('Edit Contact', 'event_espresso'), |
471 | 471 | 'order' => 15, |
472 | 472 | 'persistent' => FALSE, |
473 | - 'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url |
|
473 | + 'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url) : $this->_admin_base_url |
|
474 | 474 | ), |
475 | 475 | 'metaboxes' => array('attendee_editor_metaboxes'), |
476 | 476 | 'require_nonce' => FALSE |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | 'filename' => 'registrations_contact_list_other' |
501 | 501 | ) |
502 | 502 | ), |
503 | - 'help_tour' => array( 'Contact_List_Help_Tour' ), |
|
503 | + 'help_tour' => array('Contact_List_Help_Tour'), |
|
504 | 504 | 'metaboxes' => array(), |
505 | 505 | 'require_nonce' => FALSE |
506 | 506 | ), |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | protected function _add_screen_options() {} |
520 | 520 | protected function _add_feature_pointers() {} |
521 | 521 | public function admin_init() { |
522 | - EE_Registry::$i18n_js_strings[ 'update_att_qstns' ] = __( 'click "Update Registration Questions" to save your changes', 'event_espresso' ); |
|
522 | + EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes', 'event_espresso'); |
|
523 | 523 | } |
524 | 524 | public function admin_notices() {} |
525 | 525 | public function admin_footer_scripts() {} |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | * @return void |
538 | 538 | */ |
539 | 539 | private function _get_registration_status_array() { |
540 | - self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE); |
|
540 | + self::$_reg_status = EEM_Registration::reg_status_array(array(), TRUE); |
|
541 | 541 | } |
542 | 542 | |
543 | 543 | |
@@ -560,11 +560,11 @@ discard block |
||
560 | 560 | public function load_scripts_styles() { |
561 | 561 | //style |
562 | 562 | //wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION ); |
563 | - wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION ); |
|
563 | + wp_register_style('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION); |
|
564 | 564 | wp_enqueue_style('espresso_reg'); |
565 | 565 | |
566 | 566 | //script |
567 | - wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE); |
|
567 | + wp_register_script('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE); |
|
568 | 568 | wp_enqueue_script('espresso_reg'); |
569 | 569 | } |
570 | 570 | |
@@ -573,9 +573,9 @@ discard block |
||
573 | 573 | public function load_scripts_styles_edit_attendee() { |
574 | 574 | //stuff to only show up on our attendee edit details page. |
575 | 575 | $attendee_details_translations = array( |
576 | - 'att_publish_text' => sprintf( __('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created') ) |
|
576 | + 'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created')) |
|
577 | 577 | ); |
578 | - wp_localize_script( 'espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations ); |
|
578 | + wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations); |
|
579 | 579 | wp_enqueue_script('jquery-validate'); |
580 | 580 | } |
581 | 581 | |
@@ -584,8 +584,8 @@ discard block |
||
584 | 584 | //styles |
585 | 585 | wp_enqueue_style('espresso-ui-theme'); |
586 | 586 | //scripts |
587 | - $this->_get_reg_custom_questions_form( $this->_registration->ID() ); |
|
588 | - $this->_reg_custom_questions_form->wp_enqueue_scripts( true ); |
|
587 | + $this->_get_reg_custom_questions_form($this->_registration->ID()); |
|
588 | + $this->_reg_custom_questions_form->wp_enqueue_scripts(true); |
|
589 | 589 | } |
590 | 590 | |
591 | 591 | |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | |
596 | 596 | public function load_scripts_styles_contact_list() { |
597 | 597 | wp_deregister_style('espresso_reg'); |
598 | - wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION ); |
|
598 | + wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION); |
|
599 | 599 | wp_enqueue_style('espresso_att'); |
600 | 600 | } |
601 | 601 | |
@@ -604,9 +604,9 @@ discard block |
||
604 | 604 | |
605 | 605 | |
606 | 606 | public function load_scripts_styles_new_registration() { |
607 | - wp_register_script( 'ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
607 | + wp_register_script('ee-spco-for-admin', REG_ASSETS_URL.'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
608 | 608 | wp_enqueue_script('ee-spco-for-admin'); |
609 | - add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' ); |
|
609 | + add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true'); |
|
610 | 610 | EE_Form_Section_Proper::wp_enqueue_scripts(); |
611 | 611 | EED_Ticket_Selector::load_tckt_slctr_assets(); |
612 | 612 | EE_Datepicker_Input::enqueue_styles_and_scripts(); |
@@ -645,23 +645,23 @@ discard block |
||
645 | 645 | |
646 | 646 | /** setup reg status bulk actions **/ |
647 | 647 | $def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso'); |
648 | - if ( in_array( $match_array['approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
648 | + if (in_array($match_array['approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
649 | 649 | $def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations', 'event_espresso'); |
650 | 650 | } |
651 | 651 | $def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso'); |
652 | - if ( in_array( $match_array['decline_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
652 | + if (in_array($match_array['decline_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
653 | 653 | $def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations', 'event_espresso'); |
654 | 654 | } |
655 | 655 | $def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso'); |
656 | - if ( in_array( $match_array['pending_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
656 | + if (in_array($match_array['pending_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
657 | 657 | $def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify', 'event_espresso'); |
658 | 658 | } |
659 | 659 | $def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso'); |
660 | - if ( in_array( $match_array['no_approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
660 | + if (in_array($match_array['no_approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
661 | 661 | $def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify', 'event_espresso'); |
662 | 662 | } |
663 | 663 | $def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso'); |
664 | - if ( in_array( $match_array['cancel_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
664 | + if (in_array($match_array['cancel_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
665 | 665 | $def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify', 'event_espresso'); |
666 | 666 | } |
667 | 667 | |
@@ -670,29 +670,29 @@ discard block |
||
670 | 670 | 'slug' => 'all', |
671 | 671 | 'label' => __('View All Registrations', 'event_espresso'), |
672 | 672 | 'count' => 0, |
673 | - 'bulk_action' => array_merge( $def_reg_status_actions, array( |
|
673 | + 'bulk_action' => array_merge($def_reg_status_actions, array( |
|
674 | 674 | 'trash_registrations' => __('Trash Registrations', 'event_espresso') |
675 | - ) ) |
|
675 | + )) |
|
676 | 676 | ), |
677 | 677 | 'month' => array( |
678 | 678 | 'slug' => 'month', |
679 | 679 | 'label' => __('This Month', 'event_espresso'), |
680 | 680 | 'count' => 0, |
681 | - 'bulk_action' => array_merge( $def_reg_status_actions, array( |
|
681 | + 'bulk_action' => array_merge($def_reg_status_actions, array( |
|
682 | 682 | 'trash_registrations' => __('Trash Registrations', 'event_espresso') |
683 | 683 | )) |
684 | 684 | ), |
685 | 685 | 'today' => array( |
686 | 686 | 'slug' => 'today', |
687 | - 'label' => sprintf( __('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp' ) ) ), |
|
687 | + 'label' => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))), |
|
688 | 688 | 'count' => 0, |
689 | - 'bulk_action' => array_merge( $def_reg_status_actions, array( |
|
689 | + 'bulk_action' => array_merge($def_reg_status_actions, array( |
|
690 | 690 | 'trash_registrations' => __('Trash Registrations', 'event_espresso') |
691 | 691 | )) |
692 | 692 | ) |
693 | 693 | ); |
694 | 694 | |
695 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_delete_registration' ) ) { |
|
695 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_delete_registration')) { |
|
696 | 696 | $this->_views['incomplete'] = array( |
697 | 697 | 'slug' => 'incomplete', |
698 | 698 | 'label' => __('Incomplete', 'event_espresso'), |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | ) |
729 | 729 | ); |
730 | 730 | |
731 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_contacts', 'espresso_registrations_trash_attendees' ) ) { |
|
731 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts', 'espresso_registrations_trash_attendees')) { |
|
732 | 732 | $this->_views['trash'] = array( |
733 | 733 | 'slug' => 'trash', |
734 | 734 | 'label' => __('Trash', 'event_espresso'), |
@@ -767,42 +767,42 @@ discard block |
||
767 | 767 | 'desc' => __('View Transaction Invoice', 'event_espresso') |
768 | 768 | ), |
769 | 769 | ); |
770 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) { |
|
770 | + if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) { |
|
771 | 771 | $fc_items['resend_registration'] = array( |
772 | 772 | 'class' => 'dashicons dashicons-email-alt', |
773 | 773 | 'desc' => __('Resend Registration Details', 'event_espresso') |
774 | 774 | ); |
775 | 775 | } else { |
776 | - $fc_items['blank'] = array( 'class' => 'blank', 'desc' => '' ); |
|
776 | + $fc_items['blank'] = array('class' => 'blank', 'desc' => ''); |
|
777 | 777 | } |
778 | 778 | |
779 | 779 | $sc_items = array( |
780 | 780 | 'approved_status' => array( |
781 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved, |
|
782 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) |
|
781 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved, |
|
782 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') |
|
783 | 783 | ), |
784 | 784 | 'pending_status' => array( |
785 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment, |
|
786 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) |
|
785 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment, |
|
786 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence') |
|
787 | 787 | ), |
788 | 788 | 'incomplete_status' => array( |
789 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete, |
|
790 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_incomplete, FALSE, 'sentence' ) |
|
789 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_incomplete, |
|
790 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, FALSE, 'sentence') |
|
791 | 791 | ), |
792 | 792 | 'not_approved' => array( |
793 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved, |
|
794 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) |
|
793 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved, |
|
794 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence') |
|
795 | 795 | ), |
796 | 796 | 'declined_status' => array( |
797 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined, |
|
798 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) |
|
797 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined, |
|
798 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence') |
|
799 | 799 | ), |
800 | 800 | 'cancelled_status' => array( |
801 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled, |
|
802 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) |
|
801 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled, |
|
802 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence') |
|
803 | 803 | ) |
804 | 804 | ); |
805 | - return array_merge( $fc_items, $sc_items ); |
|
805 | + return array_merge($fc_items, $sc_items); |
|
806 | 806 | } |
807 | 807 | |
808 | 808 | |
@@ -815,15 +815,15 @@ discard block |
||
815 | 815 | |
816 | 816 | |
817 | 817 | protected function _registrations_overview_list_table() { |
818 | - $EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
819 | - if ( $EVT_ID ) { |
|
820 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID ) ) { |
|
821 | - $this->_admin_page_title .= $this->get_action_link_or_button( 'new_registration', 'add-registrant', array( 'event_id' => $EVT_ID ), 'add-new-h2' ); |
|
818 | + $EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE; |
|
819 | + if ($EVT_ID) { |
|
820 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID)) { |
|
821 | + $this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $EVT_ID), 'add-new-h2'); |
|
822 | 822 | } |
823 | - $event = EEM_Event::instance()->get_one_by_ID( $EVT_ID ); |
|
824 | - $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce( array('action' => 'edit', 'post' => $event->ID() ), EVENTS_ADMIN_URL ) . '">' . $event->get('EVT_name') . '</a>', '</h2>' ) : ''; |
|
823 | + $event = EEM_Event::instance()->get_one_by_ID($EVT_ID); |
|
824 | + $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'">'.$event->get('EVT_name').'</a>', '</h2>') : ''; |
|
825 | 825 | } |
826 | - $this->_template_args['after_list_table'] = $this->_display_legend( $this->_registration_legend_items() ); |
|
826 | + $this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items()); |
|
827 | 827 | $this->display_admin_list_table_page_with_no_sidebar(); |
828 | 828 | } |
829 | 829 | |
@@ -838,19 +838,19 @@ discard block |
||
838 | 838 | */ |
839 | 839 | private function _set_registration_object() { |
840 | 840 | //get out if we've already set the object |
841 | - if ( is_object( $this->_registration )) { |
|
841 | + if (is_object($this->_registration)) { |
|
842 | 842 | return TRUE; |
843 | 843 | } |
844 | 844 | |
845 | 845 | $REG = EEM_Registration::instance(); |
846 | 846 | |
847 | - $REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE; |
|
847 | + $REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : FALSE; |
|
848 | 848 | |
849 | - if ( $this->_registration = $REG->get_one_by_ID( $REG_ID )) |
|
849 | + if ($this->_registration = $REG->get_one_by_ID($REG_ID)) |
|
850 | 850 | return TRUE; |
851 | 851 | else { |
852 | - $error_msg = sprintf( __('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID ); |
|
853 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
852 | + $error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID); |
|
853 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
854 | 854 | $this->_registration = NULL; |
855 | 855 | return FALSE; |
856 | 856 | } |
@@ -869,25 +869,25 @@ discard block |
||
869 | 869 | * @internal param bool $all whether to ignore all query params and just return ALL registrations (or count if count is set) |
870 | 870 | * @return mixed (int|array) int = count || array of registration objects |
871 | 871 | */ |
872 | - public function get_registrations( $per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE ) { |
|
873 | - |
|
874 | - $EVT_ID = ! empty( $this->_req_data['event_id'] ) && $this->_req_data['event_id'] > 0 ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
875 | - $CAT_ID = ! empty( $this->_req_data['EVT_CAT'] ) && (int) $this->_req_data['EVT_CAT'] > 0? absint( $this->_req_data['EVT_CAT'] ) : FALSE; |
|
876 | - $reg_status = ! empty( $this->_req_data['_reg_status'] ) ? sanitize_text_field( $this->_req_data['_reg_status'] ) : FALSE; |
|
877 | - $month_range = ! empty( $this->_req_data['month_range'] ) ? sanitize_text_field( $this->_req_data['month_range'] ) : FALSE;//should be like 2013-april |
|
878 | - $today_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ? TRUE : FALSE; |
|
879 | - $this_month_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ? TRUE : FALSE; |
|
872 | + public function get_registrations($per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE) { |
|
873 | + |
|
874 | + $EVT_ID = ! empty($this->_req_data['event_id']) && $this->_req_data['event_id'] > 0 ? absint($this->_req_data['event_id']) : FALSE; |
|
875 | + $CAT_ID = ! empty($this->_req_data['EVT_CAT']) && (int) $this->_req_data['EVT_CAT'] > 0 ? absint($this->_req_data['EVT_CAT']) : FALSE; |
|
876 | + $reg_status = ! empty($this->_req_data['_reg_status']) ? sanitize_text_field($this->_req_data['_reg_status']) : FALSE; |
|
877 | + $month_range = ! empty($this->_req_data['month_range']) ? sanitize_text_field($this->_req_data['month_range']) : FALSE; //should be like 2013-april |
|
878 | + $today_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'today' ? TRUE : FALSE; |
|
879 | + $this_month_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'month' ? TRUE : FALSE; |
|
880 | 880 | $start_date = FALSE; |
881 | 881 | $end_date = FALSE; |
882 | 882 | $_where = array(); |
883 | - $trash = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE; |
|
884 | - $incomplete = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE; |
|
883 | + $trash = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE; |
|
884 | + $incomplete = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE; |
|
885 | 885 | |
886 | 886 | //set orderby |
887 | 887 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
888 | 888 | |
889 | 889 | |
890 | - switch ( $this->_req_data['orderby'] ) { |
|
890 | + switch ($this->_req_data['orderby']) { |
|
891 | 891 | case '_REG_ID': |
892 | 892 | $orderby = 'REG_ID'; |
893 | 893 | break; |
@@ -907,26 +907,26 @@ discard block |
||
907 | 907 | $orderby = 'REG_date'; |
908 | 908 | } |
909 | 909 | |
910 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC'; |
|
911 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
912 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
910 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC'; |
|
911 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
912 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
913 | 913 | |
914 | 914 | |
915 | - $offset = ($current_page-1)*$per_page; |
|
916 | - $limit = $count ? NULL : array( $offset, $per_page ); |
|
915 | + $offset = ($current_page - 1) * $per_page; |
|
916 | + $limit = $count ? NULL : array($offset, $per_page); |
|
917 | 917 | |
918 | - if($EVT_ID){ |
|
919 | - $_where['EVT_ID']=$EVT_ID; |
|
918 | + if ($EVT_ID) { |
|
919 | + $_where['EVT_ID'] = $EVT_ID; |
|
920 | 920 | } |
921 | - if($CAT_ID){ |
|
921 | + if ($CAT_ID) { |
|
922 | 922 | $_where['Event.Term_Taxonomy.term_id'] = $CAT_ID; |
923 | 923 | } |
924 | - if ( $incomplete ) { |
|
924 | + if ($incomplete) { |
|
925 | 925 | $_where['STS_ID'] = EEM_Registration::status_id_incomplete; |
926 | 926 | } else if ( ! $trash) { |
927 | - $_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete ); |
|
927 | + $_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete); |
|
928 | 928 | } |
929 | - if($reg_status){ |
|
929 | + if ($reg_status) { |
|
930 | 930 | $_where['STS_ID'] = $reg_status; |
931 | 931 | } |
932 | 932 | |
@@ -938,105 +938,105 @@ discard block |
||
938 | 938 | $time_start = ' 00:00:00'; |
939 | 939 | $time_end = ' 23:59:59'; |
940 | 940 | |
941 | - if($today_a || $today ){ |
|
941 | + if ($today_a || $today) { |
|
942 | 942 | $curdate = date('Y-m-d', current_time('timestamp')); |
943 | - $_where['REG_date']= array('BETWEEN', |
|
943 | + $_where['REG_date'] = array('BETWEEN', |
|
944 | 944 | array( |
945 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ), |
|
946 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ), |
|
945 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_start, 'Y-m-d H:i:s'), |
|
946 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_end, 'Y-m-d H:i:s'), |
|
947 | 947 | )); |
948 | - }elseif($this_month_a || $this_month){ |
|
948 | + }elseif ($this_month_a || $this_month) { |
|
949 | 949 | $this_month_r = date('m', current_time('timestamp')); |
950 | - $days_this_month = date( 't', current_time('timestamp') ); |
|
951 | - $_where['REG_date']= array('BETWEEN', |
|
950 | + $days_this_month = date('t', current_time('timestamp')); |
|
951 | + $_where['REG_date'] = array('BETWEEN', |
|
952 | 952 | array( |
953 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ), |
|
954 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' ) |
|
953 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s'), |
|
954 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s') |
|
955 | 955 | )); |
956 | - }elseif($month_range){ |
|
956 | + }elseif ($month_range) { |
|
957 | 957 | $pieces = explode(' ', $this->_req_data['month_range'], 3); |
958 | - $month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : ''; |
|
959 | - $year_r = !empty($pieces[1]) ? $pieces[1] : ''; |
|
960 | - $days_in_month = date('t', strtotime($year_r . '-' . $month_r . '-' . '01') ); |
|
961 | - $_where['REG_date']= array('BETWEEN', |
|
962 | - array( EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month . ' 23:59:59', 'Y-m-d H:i:s' ) ) ); |
|
963 | - }elseif($start_date && $end_date){ |
|
958 | + $month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : ''; |
|
959 | + $year_r = ! empty($pieces[1]) ? $pieces[1] : ''; |
|
960 | + $days_in_month = date('t', strtotime($year_r.'-'.$month_r.'-'.'01')); |
|
961 | + $_where['REG_date'] = array('BETWEEN', |
|
962 | + array(EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-'.$days_in_month.' 23:59:59', 'Y-m-d H:i:s'))); |
|
963 | + }elseif ($start_date && $end_date) { |
|
964 | 964 | throw new EE_Error("not yet supported"); |
965 | - }elseif($start_date){ |
|
965 | + }elseif ($start_date) { |
|
966 | 966 | throw new EE_Error("not yet supported"); |
967 | - }elseif($end_date){ |
|
967 | + }elseif ($end_date) { |
|
968 | 968 | throw new EE_Error("not yet supported"); |
969 | 969 | } |
970 | 970 | |
971 | - if ( ! empty( $this->_req_data['s'] ) ) { |
|
972 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
971 | + if ( ! empty($this->_req_data['s'])) { |
|
972 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
973 | 973 | $_where['OR'] = array( |
974 | - 'Event.EVT_name' => array( 'LIKE', $sstr), |
|
975 | - 'Event.EVT_desc' => array( 'LIKE', $sstr ), |
|
976 | - 'Event.EVT_short_desc' => array( 'LIKE' , $sstr ), |
|
977 | - 'Attendee.ATT_full_name' => array( 'LIKE', $sstr ), |
|
978 | - 'Attendee.ATT_fname' => array( 'LIKE', $sstr ), |
|
979 | - 'Attendee.ATT_lname' => array( 'LIKE', $sstr ), |
|
980 | - 'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ), |
|
981 | - 'Attendee.ATT_email' => array('LIKE', $sstr ), |
|
982 | - 'Attendee.ATT_address' => array( 'LIKE', $sstr ), |
|
983 | - 'Attendee.ATT_address2' => array( 'LIKE', $sstr ), |
|
984 | - 'Attendee.ATT_city' => array( 'LIKE', $sstr ), |
|
985 | - 'REG_final_price' => array( 'LIKE', $sstr ), |
|
986 | - 'REG_code' => array( 'LIKE', $sstr ), |
|
987 | - 'REG_count' => array( 'LIKE' , $sstr ), |
|
988 | - 'REG_group_size' => array( 'LIKE' , $sstr ), |
|
989 | - 'Ticket.TKT_name' => array( 'LIKE', $sstr ), |
|
990 | - 'Ticket.TKT_description' => array( 'LIKE', $sstr ), |
|
991 | - 'Transaction.Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $sstr ) |
|
974 | + 'Event.EVT_name' => array('LIKE', $sstr), |
|
975 | + 'Event.EVT_desc' => array('LIKE', $sstr), |
|
976 | + 'Event.EVT_short_desc' => array('LIKE', $sstr), |
|
977 | + 'Attendee.ATT_full_name' => array('LIKE', $sstr), |
|
978 | + 'Attendee.ATT_fname' => array('LIKE', $sstr), |
|
979 | + 'Attendee.ATT_lname' => array('LIKE', $sstr), |
|
980 | + 'Attendee.ATT_short_bio' => array('LIKE', $sstr), |
|
981 | + 'Attendee.ATT_email' => array('LIKE', $sstr), |
|
982 | + 'Attendee.ATT_address' => array('LIKE', $sstr), |
|
983 | + 'Attendee.ATT_address2' => array('LIKE', $sstr), |
|
984 | + 'Attendee.ATT_city' => array('LIKE', $sstr), |
|
985 | + 'REG_final_price' => array('LIKE', $sstr), |
|
986 | + 'REG_code' => array('LIKE', $sstr), |
|
987 | + 'REG_count' => array('LIKE', $sstr), |
|
988 | + 'REG_group_size' => array('LIKE', $sstr), |
|
989 | + 'Ticket.TKT_name' => array('LIKE', $sstr), |
|
990 | + 'Ticket.TKT_description' => array('LIKE', $sstr), |
|
991 | + 'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $sstr) |
|
992 | 992 | ); |
993 | 993 | } |
994 | 994 | |
995 | 995 | //capability checks |
996 | - if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations' ) ) { |
|
996 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations')) { |
|
997 | 997 | $_where['AND'] = array( |
998 | 998 | 'Event.EVT_wp_user' => get_current_user_id() |
999 | 999 | ); |
1000 | 1000 | } |
1001 | 1001 | |
1002 | 1002 | |
1003 | - if( $count ){ |
|
1004 | - if ( $trash ) { |
|
1005 | - return EEM_Registration::instance()->count_deleted( array( $_where )); |
|
1006 | - } else if ( $incomplete ) { |
|
1007 | - return EEM_Registration::instance()->count( array( $_where )); |
|
1003 | + if ($count) { |
|
1004 | + if ($trash) { |
|
1005 | + return EEM_Registration::instance()->count_deleted(array($_where)); |
|
1006 | + } else if ($incomplete) { |
|
1007 | + return EEM_Registration::instance()->count(array($_where)); |
|
1008 | 1008 | } else { |
1009 | - return EEM_Registration::instance()->count( array( $_where, 'default_where_conditions' => 'this_model_only' )); |
|
1009 | + return EEM_Registration::instance()->count(array($_where, 'default_where_conditions' => 'this_model_only')); |
|
1010 | 1010 | } |
1011 | 1011 | } else { |
1012 | 1012 | //make sure we remove default where conditions cause all registrations matching query are returned |
1013 | - $query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'default_where_conditions' => 'this_model_only' ); |
|
1014 | - if ( $per_page !== -1 ) { |
|
1013 | + $query_params = array($_where, 'order_by' => array($orderby => $sort), 'default_where_conditions' => 'this_model_only'); |
|
1014 | + if ($per_page !== -1) { |
|
1015 | 1015 | $query_params['limit'] = $limit; |
1016 | 1016 | } |
1017 | - $registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params); |
|
1017 | + $registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params); |
|
1018 | 1018 | |
1019 | 1019 | |
1020 | - if ( $EVT_ID && isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) { |
|
1020 | + if ($EVT_ID && isset($registrations[0]) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) { |
|
1021 | 1021 | $first_registration = $registrations[0]; |
1022 | 1022 | //EEH_Debug_Tools::printr( $registrations[0], '$registrations <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
1023 | 1023 | $event_name = $first_registration->event_obj()->name(); |
1024 | - $event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
1024 | + $event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a'); // isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
1025 | 1025 | // edit event link |
1026 | - if ( $event_name != '' ) { |
|
1027 | - $edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL ); |
|
1028 | - $edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>'; |
|
1029 | - $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ; |
|
1026 | + if ($event_name != '') { |
|
1027 | + $edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL); |
|
1028 | + $edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>'; |
|
1029 | + $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>'; |
|
1030 | 1030 | } |
1031 | 1031 | |
1032 | - $back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL ); |
|
1033 | - $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">« ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>'; |
|
1032 | + $back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL); |
|
1033 | + $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">« '.__('Back to All Registrations', 'event_espresso').'</a>'; |
|
1034 | 1034 | |
1035 | 1035 | $this->_template_args['before_admin_page_content'] = ' |
1036 | 1036 | <div id="admin-page-header"> |
1037 | - <h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1> |
|
1038 | - <h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3> |
|
1039 | - <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span> |
|
1037 | + <h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1> |
|
1038 | + <h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3> |
|
1039 | + <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span> |
|
1040 | 1040 | </div> |
1041 | 1041 | '; |
1042 | 1042 | |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | |
1075 | 1075 | $this->_set_registration_object(); |
1076 | 1076 | |
1077 | - if ( is_object( $this->_registration )) { |
|
1077 | + if (is_object($this->_registration)) { |
|
1078 | 1078 | $transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance(); |
1079 | 1079 | $this->_session = $transaction->session_data(); |
1080 | 1080 | |
@@ -1082,10 +1082,10 @@ discard block |
||
1082 | 1082 | |
1083 | 1083 | |
1084 | 1084 | $this->_template_args['reg_nmbr']['value'] = $this->_registration->ID(); |
1085 | - $this->_template_args['reg_nmbr']['label'] = __( 'Registration Number', 'event_espresso' ); |
|
1085 | + $this->_template_args['reg_nmbr']['label'] = __('Registration Number', 'event_espresso'); |
|
1086 | 1086 | |
1087 | - $this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y','g:i:s a') ; |
|
1088 | - $this->_template_args['reg_datetime']['label'] = __( 'Date', 'event_espresso' ); |
|
1087 | + $this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y', 'g:i:s a'); |
|
1088 | + $this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso'); |
|
1089 | 1089 | |
1090 | 1090 | $this->_template_args['grand_total'] = $transaction->total(); |
1091 | 1091 | |
@@ -1093,19 +1093,19 @@ discard block |
||
1093 | 1093 | // link back to overview |
1094 | 1094 | $this->_template_args['reg_overview_url'] = REG_ADMIN_URL; |
1095 | 1095 | $this->_template_args['registration'] = $this->_registration; |
1096 | - $this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $event_id ), REG_ADMIN_URL ); |
|
1097 | - $this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions' ), admin_url( 'admin.php' ) ); |
|
1098 | - $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id ), admin_url( 'admin.php' ) ); |
|
1096 | + $this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $event_id), REG_ADMIN_URL); |
|
1097 | + $this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions'), admin_url('admin.php')); |
|
1098 | + $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id), admin_url('admin.php')); |
|
1099 | 1099 | |
1100 | 1100 | //next and previous links |
1101 | - $next_reg = $this->_registration->next(null, array(), 'REG_ID' ); |
|
1102 | - $this->_template_args['next_registration'] = $next_reg ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : ''; |
|
1103 | - $previous_reg = $this->_registration->previous( null, array(), 'REG_ID' ); |
|
1104 | - $this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : ''; |
|
1101 | + $next_reg = $this->_registration->next(null, array(), 'REG_ID'); |
|
1102 | + $this->_template_args['next_registration'] = $next_reg ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : ''; |
|
1103 | + $previous_reg = $this->_registration->previous(null, array(), 'REG_ID'); |
|
1104 | + $this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : ''; |
|
1105 | 1105 | |
1106 | 1106 | // grab header |
1107 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php'; |
|
1108 | - $this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1107 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php'; |
|
1108 | + $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1109 | 1109 | |
1110 | 1110 | } else { |
1111 | 1111 | |
@@ -1124,17 +1124,17 @@ discard block |
||
1124 | 1124 | |
1125 | 1125 | |
1126 | 1126 | protected function _registration_details_metaboxes() { |
1127 | - do_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this ); |
|
1127 | + do_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this); |
|
1128 | 1128 | $this->_set_registration_object(); |
1129 | 1129 | $attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null; |
1130 | - add_meta_box( 'edit-reg-status-mbox', __( 'Registration Status', 'event_espresso' ), array( $this, 'set_reg_status_buttons_metabox' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1131 | - add_meta_box( 'edit-reg-details-mbox', __( 'Registration Details', 'event_espresso' ), array( $this, '_reg_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1132 | - if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox' ) ) { |
|
1133 | - add_meta_box( 'edit-reg-questions-mbox', __( 'Registration Form Answers', 'event_espresso' ), array( $this, '_reg_questions_meta_box' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1130 | + add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'), array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high'); |
|
1131 | + add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'), array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high'); |
|
1132 | + if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')) { |
|
1133 | + add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'), array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high'); |
|
1134 | 1134 | } |
1135 | - add_meta_box( 'edit-reg-registrant-mbox', __( 'Contact Details', 'event_espresso' ), array( $this, '_reg_registrant_side_meta_box' ), $this->wp_page_slug, 'side', 'high' ); |
|
1136 | - if ( $this->_registration->group_size() > 1 ) { |
|
1137 | - add_meta_box( 'edit-reg-attendees-mbox', __( 'Other Registrations in this Transaction', 'event_espresso' ), array( $this, '_reg_attendees_meta_box' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1135 | + add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'), array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high'); |
|
1136 | + if ($this->_registration->group_size() > 1) { |
|
1137 | + add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'), array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high'); |
|
1138 | 1138 | } |
1139 | 1139 | } |
1140 | 1140 | |
@@ -1155,23 +1155,23 @@ discard block |
||
1155 | 1155 | |
1156 | 1156 | //let's get an array of all possible buttons that we can just reference |
1157 | 1157 | $status_buttons = $this->_get_reg_status_buttons(); |
1158 | - $template_args[ 'reg_status_value' ] = $this->_registration->pretty_status(); |
|
1159 | - $template_args[ 'reg_status_class' ] = 'status-' . $this->_registration->status_ID(); |
|
1158 | + $template_args['reg_status_value'] = $this->_registration->pretty_status(); |
|
1159 | + $template_args['reg_status_class'] = 'status-'.$this->_registration->status_ID(); |
|
1160 | 1160 | $template_args['attendee'] = $this->_registration->attendee(); |
1161 | - $template = REG_TEMPLATE_PATH . 'reg_status_change_buttons.template.php'; |
|
1162 | - if ( $this->_set_registration_object() ) { |
|
1161 | + $template = REG_TEMPLATE_PATH.'reg_status_change_buttons.template.php'; |
|
1162 | + if ($this->_set_registration_object()) { |
|
1163 | 1163 | $current_status = $this->_registration->status_ID(); |
1164 | - unset( $status_buttons[$current_status] ); |
|
1165 | - if ( $current_status != EEM_Registration::status_id_pending_payment && $is_complete ) { |
|
1166 | - unset( $status_buttons[EEM_Registration::status_id_pending_payment] ); |
|
1164 | + unset($status_buttons[$current_status]); |
|
1165 | + if ($current_status != EEM_Registration::status_id_pending_payment && $is_complete) { |
|
1166 | + unset($status_buttons[EEM_Registration::status_id_pending_payment]); |
|
1167 | 1167 | } |
1168 | - $template_args['status_buttons'] = implode( "\n", $status_buttons ); |
|
1168 | + $template_args['status_buttons'] = implode("\n", $status_buttons); |
|
1169 | 1169 | } |
1170 | 1170 | $template_args['form_url'] = REG_ADMIN_URL; |
1171 | 1171 | $template_args['REG_ID'] = $this->_registration->ID(); |
1172 | - $template_args['nonce'] = wp_nonce_field( 'change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE ); |
|
1172 | + $template_args['nonce'] = wp_nonce_field('change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE); |
|
1173 | 1173 | |
1174 | - EEH_Template::display_template( $template, $template_args ); |
|
1174 | + EEH_Template::display_template($template, $template_args); |
|
1175 | 1175 | |
1176 | 1176 | } |
1177 | 1177 | |
@@ -1185,11 +1185,11 @@ discard block |
||
1185 | 1185 | private function _get_reg_status_buttons() { |
1186 | 1186 | |
1187 | 1187 | $buttons = array( |
1188 | - EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) . '">', |
|
1189 | - EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_pending_payment . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) . '">', |
|
1190 | - EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_not_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) . '">', |
|
1191 | - EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_declined . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) . '">', |
|
1192 | - EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_cancelled . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) . '">', |
|
1188 | + EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence').'">', |
|
1189 | + EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_pending_payment.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence').'">', |
|
1190 | + EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_not_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence').'">', |
|
1191 | + EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_declined.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence').'">', |
|
1192 | + EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_cancelled.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence').'">', |
|
1193 | 1193 | ); |
1194 | 1194 | return $buttons; |
1195 | 1195 | } |
@@ -1203,13 +1203,13 @@ discard block |
||
1203 | 1203 | * |
1204 | 1204 | * @return array (array with reg_id(s) updated and whether update was successful. |
1205 | 1205 | */ |
1206 | - protected function _set_registration_status_from_request( $status = false, $notify = false ) { |
|
1207 | - $REG_ID = isset( $this->_req_data['_REG_ID'] ) ? (array) $this->_req_data['_REG_ID'] : array(); |
|
1206 | + protected function _set_registration_status_from_request($status = false, $notify = false) { |
|
1207 | + $REG_ID = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array(); |
|
1208 | 1208 | |
1209 | - $success = $this->_set_registration_status( $REG_ID, $status ); |
|
1209 | + $success = $this->_set_registration_status($REG_ID, $status); |
|
1210 | 1210 | |
1211 | 1211 | //notify? |
1212 | - if ( $success && $notify && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) { |
|
1212 | + if ($success && $notify && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) { |
|
1213 | 1213 | $this->_process_resend_registration(); |
1214 | 1214 | } |
1215 | 1215 | |
@@ -1227,19 +1227,19 @@ discard block |
||
1227 | 1227 | * @param bool $status |
1228 | 1228 | * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as the array of updated registrations). |
1229 | 1229 | */ |
1230 | - protected function _set_registration_status( $REG_ID, $status = false ) { |
|
1230 | + protected function _set_registration_status($REG_ID, $status = false) { |
|
1231 | 1231 | $success = true; |
1232 | 1232 | // set default status if none is passed |
1233 | 1233 | $status = $status ? $status : EEM_Registration::status_id_pending_payment; |
1234 | 1234 | |
1235 | 1235 | //typecast and sanitize reg_id |
1236 | - $reg_ids = array_filter( (array) $REG_ID, 'absint' ); |
|
1236 | + $reg_ids = array_filter((array) $REG_ID, 'absint'); |
|
1237 | 1237 | |
1238 | 1238 | //loop through REG_ID's and change status |
1239 | - foreach ( $reg_ids as $r_id ) { |
|
1240 | - $registration = EEM_Registration::instance()->get_one_by_ID( $r_id ); |
|
1241 | - if ( $registration instanceof EE_Registration ) { |
|
1242 | - $registration->set_status( $status ); |
|
1239 | + foreach ($reg_ids as $r_id) { |
|
1240 | + $registration = EEM_Registration::instance()->get_one_by_ID($r_id); |
|
1241 | + if ($registration instanceof EE_Registration) { |
|
1242 | + $registration->set_status($status); |
|
1243 | 1243 | $result = $registration->save(); |
1244 | 1244 | |
1245 | 1245 | //verifying explicit fails because update *may* just return 0 for 0 rows affected |
@@ -1251,7 +1251,7 @@ discard block |
||
1251 | 1251 | $this->_req_data['_REG_ID'] = $reg_ids; |
1252 | 1252 | |
1253 | 1253 | //return $success and processed registrations |
1254 | - return array( 'REG_ID' => $reg_ids, 'success' => $success ); |
|
1254 | + return array('REG_ID' => $reg_ids, 'success' => $success); |
|
1255 | 1255 | } |
1256 | 1256 | |
1257 | 1257 | |
@@ -1263,37 +1263,37 @@ discard block |
||
1263 | 1263 | * @param bool $notify indicates whether the _set_registration_status_from_request does notifications or not. |
1264 | 1264 | * @return void |
1265 | 1265 | */ |
1266 | - protected function _reg_status_change_return( $STS_ID, $notify = false ) { |
|
1266 | + protected function _reg_status_change_return($STS_ID, $notify = false) { |
|
1267 | 1267 | |
1268 | - $result = ! empty( $STS_ID ) ? $this->_set_registration_status_from_request( $STS_ID, $notify ) : array( 'success' => false ); |
|
1268 | + $result = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify) : array('success' => false); |
|
1269 | 1269 | |
1270 | 1270 | |
1271 | - $success = isset( $result['success'] ) && $result['success']; |
|
1271 | + $success = isset($result['success']) && $result['success']; |
|
1272 | 1272 | |
1273 | 1273 | //setup success message |
1274 | - if ( $success ) { |
|
1275 | - $msg = is_array( $result['REG_ID'] ) && count( $result['REG_ID'] ) > 1 ? sprintf( __('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) : sprintf( __('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) ; |
|
1276 | - EE_Error::add_success( $msg ); |
|
1274 | + if ($success) { |
|
1275 | + $msg = is_array($result['REG_ID']) && count($result['REG_ID']) > 1 ? sprintf(__('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')) : sprintf(__('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')); |
|
1276 | + EE_Error::add_success($msg); |
|
1277 | 1277 | } else { |
1278 | - EE_Error::add_error( __('Something went wrong, and the status was not changed', 'event_espresso' ), __FILE__, __LINE__, __FUNCTION__ ); |
|
1278 | + EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__); |
|
1279 | 1279 | } |
1280 | 1280 | |
1281 | - $route = isset( $this->_req_data['return'] ) && $this->_req_data['return'] == 'view_registration' ? array( 'action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0] ) : array( 'action' => 'default' ); |
|
1281 | + $route = isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration' ? array('action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0]) : array('action' => 'default'); |
|
1282 | 1282 | //unset nonces |
1283 | - foreach ( $this->_req_data as $ref => $value ) { |
|
1284 | - if ( strpos( $ref, 'nonce' ) !== false ) { |
|
1285 | - unset( $this->_req_data[$ref] ); |
|
1283 | + foreach ($this->_req_data as $ref => $value) { |
|
1284 | + if (strpos($ref, 'nonce') !== false) { |
|
1285 | + unset($this->_req_data[$ref]); |
|
1286 | 1286 | continue; |
1287 | 1287 | } |
1288 | 1288 | |
1289 | - $value = is_array( $value ) ? array_map( 'urlencode', $value ) : urlencode( $value ); |
|
1289 | + $value = is_array($value) ? array_map('urlencode', $value) : urlencode($value); |
|
1290 | 1290 | $this->_req_data[$ref] = $value; |
1291 | 1291 | } |
1292 | 1292 | |
1293 | 1293 | //merge request vars so that the reloaded list table contains any existing filter query params |
1294 | - $route = array_merge( $this->_req_data, $route ); |
|
1294 | + $route = array_merge($this->_req_data, $route); |
|
1295 | 1295 | |
1296 | - $this->_redirect_after_action( false, '', '', $route, true ); |
|
1296 | + $this->_redirect_after_action(false, '', '', $route, true); |
|
1297 | 1297 | } |
1298 | 1298 | |
1299 | 1299 | |
@@ -1305,29 +1305,29 @@ discard block |
||
1305 | 1305 | protected function _change_reg_status() { |
1306 | 1306 | $this->_req_data['return'] = 'view_registration'; |
1307 | 1307 | //set notify based on whether the send notifications toggle is set or not |
1308 | - $notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] ); |
|
1309 | - $this->_req_data[ '_reg_status_id' ] = isset( $this->_req_data[ '_reg_status_id' ] ) ? $this->_req_data[ '_reg_status_id' ] : ''; |
|
1308 | + $notify = ! empty($this->_req_data['txn_reg_status_change']['send_notifications']); |
|
1309 | + $this->_req_data['_reg_status_id'] = isset($this->_req_data['_reg_status_id']) ? $this->_req_data['_reg_status_id'] : ''; |
|
1310 | 1310 | |
1311 | - switch ( $this->_req_data['_reg_status_id'] ) { |
|
1312 | - case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) : |
|
1313 | - $this->approve_registration( $notify ); |
|
1311 | + switch ($this->_req_data['_reg_status_id']) { |
|
1312 | + case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') : |
|
1313 | + $this->approve_registration($notify); |
|
1314 | 1314 | break; |
1315 | - case EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, false, 'sentence' ) : |
|
1316 | - $this->pending_registration( $notify ); |
|
1315 | + case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') : |
|
1316 | + $this->pending_registration($notify); |
|
1317 | 1317 | break; |
1318 | - case EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, false, 'sentence' ) : |
|
1319 | - $this->not_approve_registration( $notify ); |
|
1318 | + case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') : |
|
1319 | + $this->not_approve_registration($notify); |
|
1320 | 1320 | break; |
1321 | - case EEH_Template::pretty_status( EEM_Registration::status_id_declined, false, 'sentence' ) : |
|
1322 | - $this->decline_registration( $notify ); |
|
1321 | + case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') : |
|
1322 | + $this->decline_registration($notify); |
|
1323 | 1323 | break; |
1324 | - case EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, false, 'sentence' ) : |
|
1325 | - $this->cancel_registration( $notify ); |
|
1324 | + case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') : |
|
1325 | + $this->cancel_registration($notify); |
|
1326 | 1326 | break; |
1327 | 1327 | default : |
1328 | 1328 | $result['success'] = false; |
1329 | - unset( $this->_req_data['return'] ); |
|
1330 | - $this->_reg_status_change_return( '', false ); |
|
1329 | + unset($this->_req_data['return']); |
|
1330 | + $this->_reg_status_change_return('', false); |
|
1331 | 1331 | break; |
1332 | 1332 | } |
1333 | 1333 | } |
@@ -1340,8 +1340,8 @@ discard block |
||
1340 | 1340 | * @param bool $notify whether or not to notify the registrant about their approval. |
1341 | 1341 | * @return void |
1342 | 1342 | */ |
1343 | - protected function approve_registration( $notify = false ) { |
|
1344 | - $this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify ); |
|
1343 | + protected function approve_registration($notify = false) { |
|
1344 | + $this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify); |
|
1345 | 1345 | } |
1346 | 1346 | |
1347 | 1347 | |
@@ -1353,8 +1353,8 @@ discard block |
||
1353 | 1353 | * @param bool $notify whether or not to notify the registrant about their approval. |
1354 | 1354 | * @return void |
1355 | 1355 | */ |
1356 | - protected function decline_registration( $notify = false ) { |
|
1357 | - $this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify ); |
|
1356 | + protected function decline_registration($notify = false) { |
|
1357 | + $this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify); |
|
1358 | 1358 | } |
1359 | 1359 | |
1360 | 1360 | |
@@ -1366,8 +1366,8 @@ discard block |
||
1366 | 1366 | * @param bool $notify whether or not to notify the registrant about their approval. |
1367 | 1367 | * @return void |
1368 | 1368 | */ |
1369 | - protected function cancel_registration( $notify = false ) { |
|
1370 | - $this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify ); |
|
1369 | + protected function cancel_registration($notify = false) { |
|
1370 | + $this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify); |
|
1371 | 1371 | } |
1372 | 1372 | |
1373 | 1373 | |
@@ -1380,8 +1380,8 @@ discard block |
||
1380 | 1380 | * @param bool $notify whether or not to notify the registrant about their approval. |
1381 | 1381 | * @return void |
1382 | 1382 | */ |
1383 | - protected function not_approve_registration( $notify = false ) { |
|
1384 | - $this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify ); |
|
1383 | + protected function not_approve_registration($notify = false) { |
|
1384 | + $this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify); |
|
1385 | 1385 | } |
1386 | 1386 | |
1387 | 1387 | |
@@ -1392,8 +1392,8 @@ discard block |
||
1392 | 1392 | * @param bool $notify whether or not to notify the registrant about their approval. |
1393 | 1393 | * @return void |
1394 | 1394 | */ |
1395 | - protected function pending_registration( $notify = false ) { |
|
1396 | - $this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify ); |
|
1395 | + protected function pending_registration($notify = false) { |
|
1396 | + $this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify); |
|
1397 | 1397 | } |
1398 | 1398 | |
1399 | 1399 | |
@@ -1407,75 +1407,75 @@ discard block |
||
1407 | 1407 | public function _reg_details_meta_box() { |
1408 | 1408 | EEH_Autoloader::register_line_item_display_autoloaders(); |
1409 | 1409 | EEH_Autoloader::register_line_item_filter_autoloaders(); |
1410 | - EE_Registry::instance()->load_Helper( 'Line_Item' ); |
|
1410 | + EE_Registry::instance()->load_Helper('Line_Item'); |
|
1411 | 1411 | $transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance(); |
1412 | 1412 | $this->_session = $transaction->session_data(); |
1413 | 1413 | |
1414 | 1414 | $filters = new EE_Line_Item_Filter_Collection(); |
1415 | - $filters->add( new EE_Single_Registration_Line_Item_Filter( $this->_registration ) ); |
|
1416 | - $filters->add( new EE_Non_Zero_Line_Item_Filter() ); |
|
1417 | - $line_item_filter_processor = new EE_Line_Item_Filter_Processor( $filters, $transaction->total_line_item() ); |
|
1415 | + $filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration)); |
|
1416 | + $filters->add(new EE_Non_Zero_Line_Item_Filter()); |
|
1417 | + $line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item()); |
|
1418 | 1418 | $filtered_line_item_tree = $line_item_filter_processor->process(); |
1419 | 1419 | |
1420 | 1420 | $this->_template_args['REG_ID'] = $this->_registration->ID(); |
1421 | - $line_item_display = new EE_Line_Item_Display( 'reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy' ); |
|
1422 | - $this->_template_args['line_item_table'] = $line_item_display->display_line_item( $filtered_line_item_tree, array( 'EE_Registration' => $this->_registration ) ); |
|
1421 | + $line_item_display = new EE_Line_Item_Display('reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy'); |
|
1422 | + $this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree, array('EE_Registration' => $this->_registration)); |
|
1423 | 1423 | |
1424 | 1424 | |
1425 | 1425 | $attendee = $this->_registration->attendee(); |
1426 | 1426 | |
1427 | 1427 | |
1428 | - $this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID() ), TXN_ADMIN_URL ), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart' ) : ''; |
|
1429 | - $this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration' ), REG_ADMIN_URL ), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) : ''; |
|
1428 | + $this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID()), TXN_ADMIN_URL), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart') : ''; |
|
1429 | + $this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration'), REG_ADMIN_URL), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt') : ''; |
|
1430 | 1430 | |
1431 | 1431 | |
1432 | 1432 | $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign; |
1433 | - $payment = $transaction->get_first_related( 'Payment' ); |
|
1433 | + $payment = $transaction->get_first_related('Payment'); |
|
1434 | 1434 | $payment = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment; |
1435 | - $payment_method = $payment->get_first_related( 'Payment_Method' ); |
|
1435 | + $payment_method = $payment->get_first_related('Payment_Method'); |
|
1436 | 1436 | $payment_method = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance() : $payment_method; |
1437 | - $reg_status_class = 'status-' . $this->_registration->status_ID(); |
|
1437 | + $reg_status_class = 'status-'.$this->_registration->status_ID(); |
|
1438 | 1438 | $reg_details = array( |
1439 | 1439 | 'payment_method' => $payment_method->name(), |
1440 | 1440 | 'response_msg' => $payment->gateway_response(), |
1441 | - 'registration_id' => $this->_registration->get( 'REG_code' ), |
|
1441 | + 'registration_id' => $this->_registration->get('REG_code'), |
|
1442 | 1442 | 'registration_session' => $this->_registration->session_ID(), |
1443 | - 'ip_address' => isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '', |
|
1444 | - 'user_agent' => isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '', |
|
1443 | + 'ip_address' => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '', |
|
1444 | + 'user_agent' => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '', |
|
1445 | 1445 | ); |
1446 | 1446 | |
1447 | 1447 | |
1448 | - if ( isset( $reg_details['registration_id'] )) { |
|
1448 | + if (isset($reg_details['registration_id'])) { |
|
1449 | 1449 | $this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id']; |
1450 | - $this->_template_args['reg_details']['registration_id']['label'] = __( 'Registration ID', 'event_espresso' ); |
|
1450 | + $this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso'); |
|
1451 | 1451 | $this->_template_args['reg_details']['registration_id']['class'] = 'regular-text'; |
1452 | 1452 | } |
1453 | 1453 | |
1454 | - if ( isset( $reg_details['payment_method'] ) ) { |
|
1454 | + if (isset($reg_details['payment_method'])) { |
|
1455 | 1455 | $this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method']; |
1456 | - $this->_template_args['reg_details']['payment_method']['label'] = __( 'Most Recent Payment Method', 'event_espresso' ); |
|
1456 | + $this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method', 'event_espresso'); |
|
1457 | 1457 | $this->_template_args['reg_details']['payment_method']['class'] = 'regular-text'; |
1458 | 1458 | $this->_template_args['reg_details']['response_msg']['value'] = $reg_details['response_msg']; |
1459 | - $this->_template_args['reg_details']['response_msg']['label'] = __( 'Payment method response', 'event_espresso' ); |
|
1459 | + $this->_template_args['reg_details']['response_msg']['label'] = __('Payment method response', 'event_espresso'); |
|
1460 | 1460 | $this->_template_args['reg_details']['response_msg']['class'] = 'regular-text'; |
1461 | 1461 | } |
1462 | 1462 | |
1463 | 1463 | $this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session']; |
1464 | - $this->_template_args['reg_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' ); |
|
1464 | + $this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session', 'event_espresso'); |
|
1465 | 1465 | $this->_template_args['reg_details']['registration_session']['class'] = 'regular-text'; |
1466 | 1466 | |
1467 | 1467 | $this->_template_args['reg_details']['ip_address']['value'] = $reg_details['ip_address']; |
1468 | - $this->_template_args['reg_details']['ip_address']['label'] = __( 'Registration placed from IP', 'event_espresso' ); |
|
1468 | + $this->_template_args['reg_details']['ip_address']['label'] = __('Registration placed from IP', 'event_espresso'); |
|
1469 | 1469 | $this->_template_args['reg_details']['ip_address']['class'] = 'regular-text'; |
1470 | 1470 | |
1471 | 1471 | $this->_template_args['reg_details']['user_agent']['value'] = $reg_details['user_agent']; |
1472 | - $this->_template_args['reg_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' ); |
|
1472 | + $this->_template_args['reg_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso'); |
|
1473 | 1473 | $this->_template_args['reg_details']['user_agent']['class'] = 'large-text'; |
1474 | 1474 | |
1475 | - $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL ); |
|
1475 | + $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL); |
|
1476 | 1476 | |
1477 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php'; |
|
1478 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1477 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_details.template.php'; |
|
1478 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1479 | 1479 | |
1480 | 1480 | } |
1481 | 1481 | |
@@ -1489,14 +1489,14 @@ discard block |
||
1489 | 1489 | */ |
1490 | 1490 | public function _reg_questions_meta_box() { |
1491 | 1491 | //allow someone to override this method entirely |
1492 | - if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) { |
|
1493 | - $form = $this->_get_reg_custom_questions_form( $this->_registration->ID() ); |
|
1494 | - $this->_template_args[ 'att_questions' ] = count( $form->subforms() ) > 0 ? $form->get_html_and_js() : ''; |
|
1492 | + if (apply_filters('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration)) { |
|
1493 | + $form = $this->_get_reg_custom_questions_form($this->_registration->ID()); |
|
1494 | + $this->_template_args['att_questions'] = count($form->subforms()) > 0 ? $form->get_html_and_js() : ''; |
|
1495 | 1495 | $this->_template_args['reg_questions_form_action'] = 'edit_registration'; |
1496 | 1496 | $this->_template_args['REG_ID'] = $this->_registration->ID(); |
1497 | 1497 | |
1498 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
1499 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1498 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
1499 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1500 | 1500 | } |
1501 | 1501 | } |
1502 | 1502 | |
@@ -1510,12 +1510,12 @@ discard block |
||
1510 | 1510 | * @param string $output |
1511 | 1511 | * @return string |
1512 | 1512 | */ |
1513 | - public function form_before_question_group( $output ) { |
|
1513 | + public function form_before_question_group($output) { |
|
1514 | 1514 | EE_Error::doing_it_wrong( |
1515 | - __CLASS__ . '::' . __FUNCTION__, |
|
1516 | - __( 'This method would have been protected but was used on a filter callback' |
|
1515 | + __CLASS__.'::'.__FUNCTION__, |
|
1516 | + __('This method would have been protected but was used on a filter callback' |
|
1517 | 1517 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1518 | - 'event_espresso' ), |
|
1518 | + 'event_espresso'), |
|
1519 | 1519 | '4.8.32.rc.000' |
1520 | 1520 | ); |
1521 | 1521 | return ' |
@@ -1534,20 +1534,20 @@ discard block |
||
1534 | 1534 | * @param string $output |
1535 | 1535 | * @return string |
1536 | 1536 | */ |
1537 | - public function form_after_question_group( $output ) { |
|
1537 | + public function form_after_question_group($output) { |
|
1538 | 1538 | EE_Error::doing_it_wrong( |
1539 | - __CLASS__ . '::' . __FUNCTION__, |
|
1540 | - __( 'This method would have been protected but was used on a filter callback' |
|
1539 | + __CLASS__.'::'.__FUNCTION__, |
|
1540 | + __('This method would have been protected but was used on a filter callback' |
|
1541 | 1541 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1542 | - 'event_espresso' ), |
|
1542 | + 'event_espresso'), |
|
1543 | 1543 | '4.8.32.rc.000' |
1544 | 1544 | ); |
1545 | 1545 | return ' |
1546 | 1546 | <tr class="hide-if-no-js"> |
1547 | 1547 | <th> </th> |
1548 | 1548 | <td class="reg-admin-edit-attendee-question-td"> |
1549 | - <a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '"> |
|
1550 | - <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span> |
|
1549 | + <a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__('click to edit question', 'event_espresso').'"> |
|
1550 | + <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span> |
|
1551 | 1551 | <div class="dashicons dashicons-edit"></div> |
1552 | 1552 | </a> |
1553 | 1553 | </td> |
@@ -1567,18 +1567,18 @@ discard block |
||
1567 | 1567 | * @param string $label |
1568 | 1568 | * @return string |
1569 | 1569 | */ |
1570 | - public function form_form_field_label_wrap( $label ) { |
|
1570 | + public function form_form_field_label_wrap($label) { |
|
1571 | 1571 | EE_Error::doing_it_wrong( |
1572 | - __CLASS__ . '::' . __FUNCTION__, |
|
1573 | - __( 'This method would have been protected but was used on a filter callback' |
|
1572 | + __CLASS__.'::'.__FUNCTION__, |
|
1573 | + __('This method would have been protected but was used on a filter callback' |
|
1574 | 1574 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1575 | - 'event_espresso' ), |
|
1575 | + 'event_espresso'), |
|
1576 | 1576 | '4.8.32.rc.000' |
1577 | 1577 | ); |
1578 | 1578 | return ' |
1579 | 1579 | <tr> |
1580 | 1580 | <th> |
1581 | - ' . $label . ' |
|
1581 | + ' . $label.' |
|
1582 | 1582 | </th>'; |
1583 | 1583 | } |
1584 | 1584 | |
@@ -1592,17 +1592,17 @@ discard block |
||
1592 | 1592 | * @param string $input |
1593 | 1593 | * @return string |
1594 | 1594 | */ |
1595 | - public function form_form_field_input__wrap( $input ) { |
|
1595 | + public function form_form_field_input__wrap($input) { |
|
1596 | 1596 | EE_Error::doing_it_wrong( |
1597 | - __CLASS__ . '::' . __FUNCTION__, |
|
1598 | - __( 'This method would have been protected but was used on a filter callback' |
|
1597 | + __CLASS__.'::'.__FUNCTION__, |
|
1598 | + __('This method would have been protected but was used on a filter callback' |
|
1599 | 1599 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1600 | - 'event_espresso' ), |
|
1600 | + 'event_espresso'), |
|
1601 | 1601 | '4.8.32.rc.000' |
1602 | 1602 | ); |
1603 | 1603 | return ' |
1604 | 1604 | <td class="reg-admin-attendee-questions-input-td disabled-input"> |
1605 | - ' . $input . ' |
|
1605 | + ' . $input.' |
|
1606 | 1606 | </td> |
1607 | 1607 | </tr>'; |
1608 | 1608 | } |
@@ -1616,14 +1616,14 @@ discard block |
||
1616 | 1616 | * @return void |
1617 | 1617 | */ |
1618 | 1618 | protected function _update_attendee_registration_form() { |
1619 | - do_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this ); |
|
1620 | - if( $_SERVER['REQUEST_METHOD'] == 'POST'){ |
|
1621 | - $REG_ID = isset( $this->_req_data['_REG_ID'] ) ? absint( $this->_req_data['_REG_ID'] ) : FALSE; |
|
1622 | - $success = $this->_save_reg_custom_questions_form( $REG_ID ); |
|
1623 | - if( $success ) { |
|
1619 | + do_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this); |
|
1620 | + if ($_SERVER['REQUEST_METHOD'] == 'POST') { |
|
1621 | + $REG_ID = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : FALSE; |
|
1622 | + $success = $this->_save_reg_custom_questions_form($REG_ID); |
|
1623 | + if ($success) { |
|
1624 | 1624 | $what = __('Registration Form', 'event_espresso'); |
1625 | - $route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' ); |
|
1626 | - $this->_redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route ); |
|
1625 | + $route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default'); |
|
1626 | + $this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route); |
|
1627 | 1627 | } |
1628 | 1628 | } |
1629 | 1629 | } |
@@ -1634,11 +1634,11 @@ discard block |
||
1634 | 1634 | * @param int $REG_ID |
1635 | 1635 | * @return EE_Registration_Custom_Questions_Form |
1636 | 1636 | */ |
1637 | - protected function _get_reg_custom_questions_form( $REG_ID ) { |
|
1638 | - if( ! $this->_reg_custom_questions_form ) { |
|
1639 | - require_once( REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php' ); |
|
1640 | - $this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form( EEM_Registration::instance()->get_one_by_ID( $REG_ID ) ); |
|
1641 | - $this->_reg_custom_questions_form->_construct_finalize( null, null ); |
|
1637 | + protected function _get_reg_custom_questions_form($REG_ID) { |
|
1638 | + if ( ! $this->_reg_custom_questions_form) { |
|
1639 | + require_once(REG_ADMIN.'form_sections'.DS.'EE_Registration_Custom_Questions_Form.form.php'); |
|
1640 | + $this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(EEM_Registration::instance()->get_one_by_ID($REG_ID)); |
|
1641 | + $this->_reg_custom_questions_form->_construct_finalize(null, null); |
|
1642 | 1642 | } |
1643 | 1643 | return $this->_reg_custom_questions_form; |
1644 | 1644 | } |
@@ -1651,17 +1651,17 @@ discard block |
||
1651 | 1651 | * @param bool $REG_ID |
1652 | 1652 | * @return bool |
1653 | 1653 | */ |
1654 | - private function _save_reg_custom_questions_form( $REG_ID = FALSE ) { |
|
1654 | + private function _save_reg_custom_questions_form($REG_ID = FALSE) { |
|
1655 | 1655 | |
1656 | 1656 | if ( ! $REG_ID) { |
1657 | - EE_Error::add_error( __('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
1657 | + EE_Error::add_error(__('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1658 | 1658 | } |
1659 | - $form = $this->_get_reg_custom_questions_form( $REG_ID ); |
|
1660 | - $form->receive_form_submission( $this->_req_data ); |
|
1659 | + $form = $this->_get_reg_custom_questions_form($REG_ID); |
|
1660 | + $form->receive_form_submission($this->_req_data); |
|
1661 | 1661 | $success = false; |
1662 | - if( $form->is_valid() ) { |
|
1663 | - foreach( $form->subforms() as $question_group_id => $question_group_form ) { |
|
1664 | - foreach( $question_group_form->inputs() as $question_id => $input ) { |
|
1662 | + if ($form->is_valid()) { |
|
1663 | + foreach ($form->subforms() as $question_group_id => $question_group_form) { |
|
1664 | + foreach ($question_group_form->inputs() as $question_id => $input) { |
|
1665 | 1665 | $where_conditions = array( |
1666 | 1666 | 'QST_ID' => $question_id, |
1667 | 1667 | 'REG_ID' => $REG_ID |
@@ -1669,19 +1669,19 @@ discard block |
||
1669 | 1669 | $possibly_new_values = array( |
1670 | 1670 | 'ANS_value' => $input->normalized_value() |
1671 | 1671 | ); |
1672 | - $answer = EEM_Answer::instance()->get_one( array( $where_conditions ) ); |
|
1673 | - if( $answer instanceof EE_Answer ) { |
|
1674 | - $success = $answer->save( $possibly_new_values ); |
|
1672 | + $answer = EEM_Answer::instance()->get_one(array($where_conditions)); |
|
1673 | + if ($answer instanceof EE_Answer) { |
|
1674 | + $success = $answer->save($possibly_new_values); |
|
1675 | 1675 | } else { |
1676 | 1676 | //insert it then |
1677 | - $cols_n_vals = array_merge( $where_conditions, $possibly_new_values ); |
|
1678 | - $answer = EE_Answer::new_instance( $cols_n_vals ); |
|
1677 | + $cols_n_vals = array_merge($where_conditions, $possibly_new_values); |
|
1678 | + $answer = EE_Answer::new_instance($cols_n_vals); |
|
1679 | 1679 | $success = $answer->save(); |
1680 | 1680 | } |
1681 | 1681 | } |
1682 | 1682 | } |
1683 | 1683 | } else { |
1684 | - EE_Error::add_error( $form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__ ); |
|
1684 | + EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__); |
|
1685 | 1685 | } |
1686 | 1686 | return $success; |
1687 | 1687 | } |
@@ -1699,30 +1699,30 @@ discard block |
||
1699 | 1699 | $registrations = $REG->get_all(array( |
1700 | 1700 | array( |
1701 | 1701 | 'TXN_ID'=>$this->_registration->transaction_ID(), |
1702 | - 'REG_ID'=>array('!=',$this->_registration->ID()) |
|
1702 | + 'REG_ID'=>array('!=', $this->_registration->ID()) |
|
1703 | 1703 | ), |
1704 | 1704 | 'force_join'=>array('Attendee'))); |
1705 | 1705 | |
1706 | 1706 | $this->_template_args['attendees'] = array(); |
1707 | 1707 | $this->_template_args['attendee_notice'] = ''; |
1708 | 1708 | EE_Registry::instance()->load_helper('Array'); |
1709 | - if ( empty( $registrations) || ( is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations) ) ) { |
|
1710 | - EE_Error::add_error( __('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
1709 | + if (empty($registrations) || (is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations))) { |
|
1710 | + EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1711 | 1711 | $this->_template_args['attendee_notice'] = EE_Error::get_notices(); |
1712 | 1712 | } else { |
1713 | 1713 | |
1714 | 1714 | $att_nmbr = 1; |
1715 | - foreach ( $registrations as $registration ) { |
|
1715 | + foreach ($registrations as $registration) { |
|
1716 | 1716 | /* @var $registration EE_Registration */ |
1717 | 1717 | $attendee = $registration->attendee() ? $registration->attendee() : EEM_Attendee::instance()->create_default_object(); |
1718 | - $this->_template_args['attendees'][ $att_nmbr ]['fname'] = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : ''; |
|
1719 | - $this->_template_args['attendees'][ $att_nmbr ]['lname'] = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : ''; |
|
1720 | - $this->_template_args['attendees'][ $att_nmbr ]['email'] = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : ''; |
|
1721 | - $this->_template_args['attendees'][ $att_nmbr ]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : ''; |
|
1718 | + $this->_template_args['attendees'][$att_nmbr]['fname'] = $attendee->fname(); //( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : ''; |
|
1719 | + $this->_template_args['attendees'][$att_nmbr]['lname'] = $attendee->lname(); //( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : ''; |
|
1720 | + $this->_template_args['attendees'][$att_nmbr]['email'] = $attendee->email(); //( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : ''; |
|
1721 | + $this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price(); //( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : ''; |
|
1722 | 1722 | |
1723 | - $this->_template_args['attendees'][ $att_nmbr ]['address'] = implode( ', ', $attendee->full_address_as_array() ); |
|
1723 | + $this->_template_args['attendees'][$att_nmbr]['address'] = implode(', ', $attendee->full_address_as_array()); |
|
1724 | 1724 | |
1725 | - $this->_template_args['attendees'][ $att_nmbr ]['att_link'] = self::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL ); |
|
1725 | + $this->_template_args['attendees'][$att_nmbr]['att_link'] = self::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL); |
|
1726 | 1726 | |
1727 | 1727 | $att_nmbr++; |
1728 | 1728 | } |
@@ -1734,8 +1734,8 @@ discard block |
||
1734 | 1734 | |
1735 | 1735 | // $this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees' ), REG_ADMIN_URL ); |
1736 | 1736 | } |
1737 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php'; |
|
1738 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1737 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_attendees.template.php'; |
|
1738 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1739 | 1739 | |
1740 | 1740 | } |
1741 | 1741 | |
@@ -1756,11 +1756,11 @@ discard block |
||
1756 | 1756 | $attendee = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object(); |
1757 | 1757 | |
1758 | 1758 | //now let's determine if this is not the primary registration. If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show cereate button or not) |
1759 | - if ( ! $this->_registration->is_primary_registrant() ) { |
|
1759 | + if ( ! $this->_registration->is_primary_registrant()) { |
|
1760 | 1760 | $primary_registration = $this->_registration->get_primary_registration(); |
1761 | 1761 | $primary_attendee = $primary_registration->attendee(); |
1762 | 1762 | |
1763 | - if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID() ) { |
|
1763 | + if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) { |
|
1764 | 1764 | //in here? This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg. |
1765 | 1765 | $primary_registration = NULL; |
1766 | 1766 | } |
@@ -1769,28 +1769,28 @@ discard block |
||
1769 | 1769 | } |
1770 | 1770 | |
1771 | 1771 | $this->_template_args['ATT_ID'] = $attendee->ID(); |
1772 | - $this->_template_args['fname'] = $attendee->fname();//$this->_registration->ATT_fname; |
|
1773 | - $this->_template_args['lname'] = $attendee->lname();//$this->_registration->ATT_lname; |
|
1774 | - $this->_template_args['email'] = $attendee->email();//$this->_registration->ATT_email; |
|
1772 | + $this->_template_args['fname'] = $attendee->fname(); //$this->_registration->ATT_fname; |
|
1773 | + $this->_template_args['lname'] = $attendee->lname(); //$this->_registration->ATT_lname; |
|
1774 | + $this->_template_args['email'] = $attendee->email(); //$this->_registration->ATT_email; |
|
1775 | 1775 | $this->_template_args['phone'] = $attendee->phone(); |
1776 | 1776 | |
1777 | - EE_Registry::instance()->load_helper( 'Formatter' ); |
|
1778 | - $this->_template_args[ 'formatted_address' ] = EEH_Address::format( $attendee ); |
|
1777 | + EE_Registry::instance()->load_helper('Formatter'); |
|
1778 | + $this->_template_args['formatted_address'] = EEH_Address::format($attendee); |
|
1779 | 1779 | |
1780 | 1780 | |
1781 | 1781 | //edit link |
1782 | - $this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL ); |
|
1783 | - $this->_template_args['att_edit_label'] = __('View/Edit Contact' ); |
|
1782 | + $this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL); |
|
1783 | + $this->_template_args['att_edit_label'] = __('View/Edit Contact'); |
|
1784 | 1784 | |
1785 | 1785 | //create link |
1786 | - $this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID() ), REG_ADMIN_URL ): ''; |
|
1786 | + $this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID()), REG_ADMIN_URL) : ''; |
|
1787 | 1787 | $this->_template_args['create_label'] = __('Create Contact', 'event_espresso'); |
1788 | 1788 | |
1789 | 1789 | $this->_template_args['att_check'] = $att_check; |
1790 | 1790 | |
1791 | 1791 | |
1792 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php'; |
|
1793 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1792 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_side_meta_box_registrant.template.php'; |
|
1793 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1794 | 1794 | } |
1795 | 1795 | |
1796 | 1796 | |
@@ -1803,7 +1803,7 @@ discard block |
||
1803 | 1803 | * @access protected |
1804 | 1804 | * @return void |
1805 | 1805 | */ |
1806 | - protected function _trash_or_restore_registrations( $trash = TRUE ) { |
|
1806 | + protected function _trash_or_restore_registrations($trash = TRUE) { |
|
1807 | 1807 | $REGM = EEM_Registration::instance(); |
1808 | 1808 | |
1809 | 1809 | $success = 1; |
@@ -1813,26 +1813,26 @@ discard block |
||
1813 | 1813 | $dtts = array(); |
1814 | 1814 | |
1815 | 1815 | //if empty _REG_ID then get out because there's nothing to do |
1816 | - if ( empty( $this->_req_data['_REG_ID'] ) ) { |
|
1816 | + if (empty($this->_req_data['_REG_ID'])) { |
|
1817 | 1817 | $msg = $trash ? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.', 'event_espresso') : __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.', 'event_espresso'); |
1818 | - EE_Error::add_error( $msg, __FILE__, __LINE__, __FUNCTION__ ); |
|
1819 | - $this->_redirect_after_action(FALSE, '', '', array(), TRUE ); |
|
1818 | + EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__); |
|
1819 | + $this->_redirect_after_action(FALSE, '', '', array(), TRUE); |
|
1820 | 1820 | } |
1821 | 1821 | |
1822 | 1822 | //Checkboxes |
1823 | - if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1823 | + if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1824 | 1824 | // if array has more than one element than success message should be plural |
1825 | - $success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1; |
|
1825 | + $success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1; |
|
1826 | 1826 | // cycle thru checkboxes |
1827 | - while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) { |
|
1827 | + while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) { |
|
1828 | 1828 | |
1829 | 1829 | $REG = $REGM->get_one_by_ID($REG_ID); |
1830 | 1830 | $payment_count = $REG->get_first_related('Transaction')->count_related('Payment'); |
1831 | - if ( $payment_count > 0 ) { |
|
1832 | - $name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ); |
|
1831 | + if ($payment_count > 0) { |
|
1832 | + $name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __('Unknown Attendee', 'event_espresso'); |
|
1833 | 1833 | $error = 1; |
1834 | 1834 | $success = 0; |
1835 | - EE_Error::add_error( sprintf( __('The registration for %s could not be trashed because it has payments attached to the related transaction. If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1835 | + EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction. If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__); |
|
1836 | 1836 | continue; //can't trash this registration because it has payments. |
1837 | 1837 | } |
1838 | 1838 | $ticket = $REG->get_first_related('Ticket'); |
@@ -1841,7 +1841,7 @@ discard block |
||
1841 | 1841 | $dtts = array_merge($dtts, $dtt); |
1842 | 1842 | |
1843 | 1843 | $updated = $trash ? $REG->delete() : $REG->restore(); |
1844 | - if ( !$updated ) { |
|
1844 | + if ( ! $updated) { |
|
1845 | 1845 | $success = 0; |
1846 | 1846 | } else { |
1847 | 1847 | $success = 2; |
@@ -1856,7 +1856,7 @@ discard block |
||
1856 | 1856 | $tickets[$ticket->ID()] = $ticket; |
1857 | 1857 | $dtts = $ticket->get_many_related('Datetime'); |
1858 | 1858 | $updated = $trash ? $REG->delete() : $REG->restore(); |
1859 | - if ( ! $updated ) { |
|
1859 | + if ( ! $updated) { |
|
1860 | 1860 | $success = 0; |
1861 | 1861 | } |
1862 | 1862 | |
@@ -1866,10 +1866,10 @@ discard block |
||
1866 | 1866 | EEM_Ticket::instance()->update_tickets_sold($tickets); |
1867 | 1867 | EEM_Datetime::instance()->update_sold($dtts); |
1868 | 1868 | |
1869 | - $what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' ); |
|
1870 | - $action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' ); |
|
1869 | + $what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso'); |
|
1870 | + $action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso'); |
|
1871 | 1871 | $overwrite_msgs = $error ? TRUE : FALSE; |
1872 | - $this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), $overwrite_msgs ); |
|
1872 | + $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs); |
|
1873 | 1873 | } |
1874 | 1874 | |
1875 | 1875 | |
@@ -1893,16 +1893,16 @@ discard block |
||
1893 | 1893 | $success = 1; |
1894 | 1894 | |
1895 | 1895 | //Checkboxes |
1896 | - if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1896 | + if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1897 | 1897 | // if array has more than one element than success message should be plural |
1898 | - $success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1; |
|
1898 | + $success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1; |
|
1899 | 1899 | // cycle thru checkboxes |
1900 | - while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) { |
|
1900 | + while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) { |
|
1901 | 1901 | $REG = $REG_MDL->get_one_by_ID($REG_ID); |
1902 | - if ( ! $REG instanceof EE_Registration ) |
|
1902 | + if ( ! $REG instanceof EE_Registration) |
|
1903 | 1903 | continue; |
1904 | 1904 | $deleted = $this->_delete_registration($REG); |
1905 | - if ( !$deleted ) { |
|
1905 | + if ( ! $deleted) { |
|
1906 | 1906 | $success = 0; |
1907 | 1907 | } |
1908 | 1908 | } |
@@ -1912,15 +1912,15 @@ discard block |
||
1912 | 1912 | $REG_ID = $this->_req_data['_REG_ID']; |
1913 | 1913 | $REG = $REG_MDL->get_one_by_ID($REG_ID); |
1914 | 1914 | $deleted = $this->_delete_registration($REG); |
1915 | - if ( ! $deleted ) { |
|
1915 | + if ( ! $deleted) { |
|
1916 | 1916 | $success = 0; |
1917 | 1917 | } |
1918 | 1918 | |
1919 | 1919 | } |
1920 | 1920 | |
1921 | - $what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' ); |
|
1922 | - $action_desc = __( 'permanently deleted.', 'event_espresso' ); |
|
1923 | - $this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), TRUE ); |
|
1921 | + $what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso'); |
|
1922 | + $action_desc = __('permanently deleted.', 'event_espresso'); |
|
1923 | + $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), TRUE); |
|
1924 | 1924 | } |
1925 | 1925 | |
1926 | 1926 | |
@@ -1932,31 +1932,31 @@ discard block |
||
1932 | 1932 | * @param EE_Registration $REG registration to be deleted permenantly |
1933 | 1933 | * @return boolean true = successful deletion, false = fail. |
1934 | 1934 | */ |
1935 | - protected function _delete_registration( EE_Registration $REG ) { |
|
1935 | + protected function _delete_registration(EE_Registration $REG) { |
|
1936 | 1936 | //first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed. |
1937 | 1937 | $TXN = $REG->get_first_related('Transaction'); |
1938 | 1938 | $REGS = $TXN->get_many_related('Registration'); |
1939 | 1939 | |
1940 | 1940 | $all_trashed = TRUE; |
1941 | - foreach ( $REGS as $registration ) { |
|
1942 | - if ( ! $registration->get('REG_deleted') ) |
|
1941 | + foreach ($REGS as $registration) { |
|
1942 | + if ( ! $registration->get('REG_deleted')) |
|
1943 | 1943 | $all_trashed = FALSE; |
1944 | 1944 | } |
1945 | 1945 | |
1946 | - if ( ! $all_trashed ) { |
|
1947 | - EE_Error::add_error( __('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well. These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
1946 | + if ( ! $all_trashed) { |
|
1947 | + EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well. These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1948 | 1948 | return false; |
1949 | 1949 | } |
1950 | 1950 | |
1951 | 1951 | //k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one). |
1952 | - foreach ( $REGS as $registration ) { |
|
1952 | + foreach ($REGS as $registration) { |
|
1953 | 1953 | |
1954 | 1954 | //delete related answers |
1955 | 1955 | $registration->delete_related_permanently('Answer'); |
1956 | 1956 | |
1957 | 1957 | //remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact) |
1958 | 1958 | $attendee = $registration->get_first_related('Attendee'); |
1959 | - if ( $attendee instanceof EE_Attendee ) { |
|
1959 | + if ($attendee instanceof EE_Attendee) { |
|
1960 | 1960 | $registration->_remove_relation_to($attendee, 'Attendee'); |
1961 | 1961 | } |
1962 | 1962 | |
@@ -1966,7 +1966,7 @@ discard block |
||
1966 | 1966 | //now delete permanently the checkins related to this registration. |
1967 | 1967 | $registration->delete_related_permanently('Checkin'); |
1968 | 1968 | |
1969 | - if ( $registration->ID() === $REG->ID() ) |
|
1969 | + if ($registration->ID() === $REG->ID()) |
|
1970 | 1970 | continue; //we don't want to delete permanently the existing registration just yet. |
1971 | 1971 | |
1972 | 1972 | //remove relation to transaction for these registrations if NOT the existing registrations |
@@ -1999,34 +1999,34 @@ discard block |
||
1999 | 1999 | * @return void |
2000 | 2000 | */ |
2001 | 2001 | public function new_registration() { |
2002 | - if ( ! $this->_set_reg_event() ) { |
|
2003 | - throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso') ); |
|
2002 | + if ( ! $this->_set_reg_event()) { |
|
2003 | + throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso')); |
|
2004 | 2004 | } |
2005 | - EE_Registry::instance()->REQ->set_espresso_page( TRUE ); |
|
2005 | + EE_Registry::instance()->REQ->set_espresso_page(TRUE); |
|
2006 | 2006 | |
2007 | 2007 | // gotta start with a clean slate if we're not coming here via ajax |
2008 | - if ( ! defined('DOING_AJAX' ) && ( ! isset( $this->_req_data['processing_registration'] ) || isset( $this->_req_data['step_error'] ))) { |
|
2009 | - EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ ); |
|
2008 | + if ( ! defined('DOING_AJAX') && ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))) { |
|
2009 | + EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__); |
|
2010 | 2010 | } |
2011 | 2011 | |
2012 | - $this->_template_args['event_name'] = '' ; |
|
2012 | + $this->_template_args['event_name'] = ''; |
|
2013 | 2013 | // event name |
2014 | - if ( $this->_reg_event ) { |
|
2014 | + if ($this->_reg_event) { |
|
2015 | 2015 | $this->_template_args['event_name'] = $this->_reg_event->name(); |
2016 | - $edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$this->_reg_event->ID() ), EVENTS_ADMIN_URL ); |
|
2017 | - $edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $this->_reg_event->name() . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>'; |
|
2018 | - $this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ; |
|
2016 | + $edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$this->_reg_event->ID()), EVENTS_ADMIN_URL); |
|
2017 | + $edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$this->_reg_event->name().'">'.__('Edit Event', 'event_espresso').'</a>'; |
|
2018 | + $this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>'; |
|
2019 | 2019 | } |
2020 | 2020 | |
2021 | 2021 | $this->_template_args['step_content'] = $this->_get_registration_step_content(); |
2022 | 2022 | |
2023 | - if ( defined('DOING_AJAX' ) ) |
|
2023 | + if (defined('DOING_AJAX')) |
|
2024 | 2024 | $this->_return_json(); |
2025 | 2025 | |
2026 | 2026 | |
2027 | 2027 | // grab header |
2028 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php'; |
|
2029 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2028 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee.template.php'; |
|
2029 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2030 | 2030 | |
2031 | 2031 | //$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE ); |
2032 | 2032 | // the details template wrapper |
@@ -2044,7 +2044,7 @@ discard block |
||
2044 | 2044 | */ |
2045 | 2045 | protected function _get_registration_step_content() { |
2046 | 2046 | |
2047 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee_step_content.template.php'; |
|
2047 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee_step_content.template.php'; |
|
2048 | 2048 | $template_args = array( |
2049 | 2049 | 'title' => '', |
2050 | 2050 | 'content' => '', |
@@ -2065,11 +2065,11 @@ discard block |
||
2065 | 2065 | |
2066 | 2066 | //if the cart is empty then we know we're at step one so we'll display ticket selector |
2067 | 2067 | $cart = EE_Registry::instance()->SSN->get_session_data('cart'); |
2068 | - $step = empty( $cart ) ? 'ticket' : 'questions'; |
|
2069 | - switch ( $step ) { |
|
2068 | + $step = empty($cart) ? 'ticket' : 'questions'; |
|
2069 | + switch ($step) { |
|
2070 | 2070 | case 'ticket' : |
2071 | 2071 | $template_args['title'] = __('Step One: Select the Ticket for this registration', 'event_espresso'); |
2072 | - $template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector( $this->_reg_event ); |
|
2072 | + $template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event); |
|
2073 | 2073 | $template_args['step_button_text'] = __('Add Tickets and Continue to Registrant Details', 'event_espresso'); |
2074 | 2074 | $template_args['show_notification_toggle'] = FALSE; |
2075 | 2075 | break; |
@@ -2082,9 +2082,9 @@ discard block |
||
2082 | 2082 | break; |
2083 | 2083 | } |
2084 | 2084 | |
2085 | - $this->_set_add_edit_form_tags( 'process_reg_step', $hidden_fields ); //we come back to the process_registration_step route. |
|
2085 | + $this->_set_add_edit_form_tags('process_reg_step', $hidden_fields); //we come back to the process_registration_step route. |
|
2086 | 2086 | |
2087 | - return EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
2087 | + return EEH_Template::display_template($template_path, $template_args, TRUE); |
|
2088 | 2088 | } |
2089 | 2089 | |
2090 | 2090 | |
@@ -2098,11 +2098,11 @@ discard block |
||
2098 | 2098 | * @return boolean |
2099 | 2099 | */ |
2100 | 2100 | private function _set_reg_event() { |
2101 | - if ( is_object( $this->_reg_event )) { |
|
2101 | + if (is_object($this->_reg_event)) { |
|
2102 | 2102 | return TRUE; |
2103 | 2103 | } |
2104 | - $EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
2105 | - if ( ! $EVT_ID ) { |
|
2104 | + $EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE; |
|
2105 | + if ( ! $EVT_ID) { |
|
2106 | 2106 | return FALSE; |
2107 | 2107 | } |
2108 | 2108 | |
@@ -2123,62 +2123,62 @@ discard block |
||
2123 | 2123 | public function process_reg_step() { |
2124 | 2124 | |
2125 | 2125 | $this->_set_reg_event(); |
2126 | - EE_Registry::instance()->REQ->set_espresso_page( TRUE ); |
|
2126 | + EE_Registry::instance()->REQ->set_espresso_page(TRUE); |
|
2127 | 2127 | |
2128 | 2128 | //what step are we on? |
2129 | - $cart = EE_Registry::instance()->SSN->get_session_data( 'cart' ); |
|
2130 | - $step = empty( $cart ) ? 'ticket' : 'questions'; |
|
2129 | + $cart = EE_Registry::instance()->SSN->get_session_data('cart'); |
|
2130 | + $step = empty($cart) ? 'ticket' : 'questions'; |
|
2131 | 2131 | |
2132 | 2132 | //if doing ajax then we need to verify the nonce |
2133 | - if ( 'DOING_AJAX' ) { |
|
2134 | - $nonce = isset( $this->_req_data[$this->_req_nonce] ) ? sanitize_text_field( $this->_req_data[$this->_req_nonce] ) : ''; |
|
2135 | - $this->_verify_nonce( $nonce, $this->_req_nonce ); |
|
2133 | + if ('DOING_AJAX') { |
|
2134 | + $nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : ''; |
|
2135 | + $this->_verify_nonce($nonce, $this->_req_nonce); |
|
2136 | 2136 | } |
2137 | 2137 | |
2138 | - switch ( $step ) { |
|
2138 | + switch ($step) { |
|
2139 | 2139 | case 'ticket' : |
2140 | 2140 | //process ticket selection |
2141 | 2141 | $success = EED_Ticket_Selector::instance()->process_ticket_selections(); |
2142 | - if ( $success ) { |
|
2143 | - EE_Error::add_success( __('Tickets Selected. Now complete the registration.'), 'event_espresso'); |
|
2142 | + if ($success) { |
|
2143 | + EE_Error::add_success(__('Tickets Selected. Now complete the registration.'), 'event_espresso'); |
|
2144 | 2144 | } else { |
2145 | 2145 | $query_args['step_error'] = $this->_req_data['step_error'] = TRUE; |
2146 | 2146 | } |
2147 | - if ( defined('DOING_AJAX') ) { |
|
2147 | + if (defined('DOING_AJAX')) { |
|
2148 | 2148 | $this->new_registration(); //display next step |
2149 | 2149 | } else { |
2150 | 2150 | $query_args['action'] = 'new_registration'; |
2151 | 2151 | $query_args['processing_registration'] = true; |
2152 | 2152 | $query_args['event_id'] = $this->_reg_event->ID(); |
2153 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
2153 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2154 | 2154 | } |
2155 | 2155 | break; |
2156 | 2156 | case 'questions' : |
2157 | - if( ! isset( $this->_req_data[ 'txn_reg_status_change' ], $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] ) ) { |
|
2158 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 ); |
|
2157 | + if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) { |
|
2158 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15); |
|
2159 | 2159 | } |
2160 | 2160 | //process registration |
2161 | 2161 | $transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin(); |
2162 | - if ( ! $transaction instanceof EE_Transaction ) { |
|
2162 | + if ( ! $transaction instanceof EE_Transaction) { |
|
2163 | 2163 | $query_args = array( |
2164 | 2164 | 'action' => 'new_registration', |
2165 | 2165 | 'processing_registration' => true, |
2166 | 2166 | 'event_id' => $this->_reg_event->ID() |
2167 | 2167 | ); |
2168 | 2168 | |
2169 | - if ( defined('DOING_AJAX' )) { |
|
2169 | + if (defined('DOING_AJAX')) { |
|
2170 | 2170 | //display registration form again because there are errors (maybe validation?) |
2171 | 2171 | $this->new_registration(); |
2172 | 2172 | return; |
2173 | 2173 | } else { |
2174 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
2174 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2175 | 2175 | return; |
2176 | 2176 | } |
2177 | 2177 | } |
2178 | 2178 | /** @type EE_Transaction_Payments $transaction_payments */ |
2179 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
2179 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
2180 | 2180 | // maybe update status, and make sure to save transaction if not done already |
2181 | - if ( ! $transaction_payments->update_transaction_status_based_on_total_paid( $transaction )) { |
|
2181 | + if ( ! $transaction_payments->update_transaction_status_based_on_total_paid($transaction)) { |
|
2182 | 2182 | $transaction->save(); |
2183 | 2183 | } |
2184 | 2184 | $query_args = array( |
@@ -2186,8 +2186,8 @@ discard block |
||
2186 | 2186 | 'TXN_ID' => $transaction->ID(), |
2187 | 2187 | 'page' => 'espresso_transactions' |
2188 | 2188 | ); |
2189 | - EE_Error::add_success( __('Registration Created. Please review the transaction and add any payments as necessary', 'event_espresso') ); |
|
2190 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
2189 | + EE_Error::add_success(__('Registration Created. Please review the transaction and add any payments as necessary', 'event_espresso')); |
|
2190 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2191 | 2191 | break; |
2192 | 2192 | } |
2193 | 2193 | |
@@ -2207,7 +2207,7 @@ discard block |
||
2207 | 2207 | * @return void |
2208 | 2208 | */ |
2209 | 2209 | protected function _attendee_contact_list_table() { |
2210 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2210 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2211 | 2211 | $this->_search_btn_label = __('Contacts', 'event_espresso'); |
2212 | 2212 | $this->display_admin_list_table_page_with_no_sidebar(); |
2213 | 2213 | } |
@@ -2222,10 +2222,10 @@ discard block |
||
2222 | 2222 | * @access public |
2223 | 2223 | * @return array |
2224 | 2224 | */ |
2225 | - public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) { |
|
2225 | + public function get_attendees($per_page, $count = FALSE, $trash = FALSE) { |
|
2226 | 2226 | |
2227 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2228 | - require_once( REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php' ); |
|
2227 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2228 | + require_once(REG_ADMIN.'EE_Attendee_Contact_List_Table.class.php'); |
|
2229 | 2229 | $ATT_MDL = EEM_Attendee::instance(); |
2230 | 2230 | |
2231 | 2231 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
@@ -2253,47 +2253,47 @@ discard block |
||
2253 | 2253 | $orderby = 'ATT_lname'; |
2254 | 2254 | } |
2255 | 2255 | |
2256 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC'; |
|
2256 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC'; |
|
2257 | 2257 | |
2258 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
2259 | - $per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10; |
|
2260 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
2258 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
2259 | + $per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10; |
|
2260 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
2261 | 2261 | |
2262 | 2262 | $_where = array(); |
2263 | 2263 | |
2264 | - if ( isset( $this->_req_data['s'] ) ) { |
|
2265 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
2264 | + if (isset($this->_req_data['s'])) { |
|
2265 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
2266 | 2266 | $_where['OR'] = array( |
2267 | - 'Registration.Event.EVT_name' => array( 'LIKE', $sstr), |
|
2268 | - 'Registration.Event.EVT_desc' => array( 'LIKE', $sstr ), |
|
2269 | - 'Registration.Event.EVT_short_desc' => array( 'LIKE' , $sstr ), |
|
2270 | - 'ATT_fname' => array( 'LIKE', $sstr ), |
|
2271 | - 'ATT_lname' => array( 'LIKE', $sstr ), |
|
2272 | - 'ATT_short_bio' => array( 'LIKE', $sstr ), |
|
2273 | - 'ATT_email' => array('LIKE', $sstr ), |
|
2274 | - 'ATT_address' => array( 'LIKE', $sstr ), |
|
2275 | - 'ATT_address2' => array( 'LIKE', $sstr ), |
|
2276 | - 'ATT_city' => array( 'LIKE', $sstr ), |
|
2277 | - 'Country.CNT_name' => array( 'LIKE', $sstr ), |
|
2278 | - 'State.STA_name' => array('LIKE', $sstr ), |
|
2279 | - 'ATT_phone' => array( 'LIKE', $sstr ), |
|
2280 | - 'Registration.REG_final_price' => array( 'LIKE', $sstr ), |
|
2281 | - 'Registration.REG_code' => array( 'LIKE', $sstr ), |
|
2282 | - 'Registration.REG_count' => array( 'LIKE' , $sstr ), |
|
2283 | - 'Registration.REG_group_size' => array( 'LIKE' , $sstr ) |
|
2267 | + 'Registration.Event.EVT_name' => array('LIKE', $sstr), |
|
2268 | + 'Registration.Event.EVT_desc' => array('LIKE', $sstr), |
|
2269 | + 'Registration.Event.EVT_short_desc' => array('LIKE', $sstr), |
|
2270 | + 'ATT_fname' => array('LIKE', $sstr), |
|
2271 | + 'ATT_lname' => array('LIKE', $sstr), |
|
2272 | + 'ATT_short_bio' => array('LIKE', $sstr), |
|
2273 | + 'ATT_email' => array('LIKE', $sstr), |
|
2274 | + 'ATT_address' => array('LIKE', $sstr), |
|
2275 | + 'ATT_address2' => array('LIKE', $sstr), |
|
2276 | + 'ATT_city' => array('LIKE', $sstr), |
|
2277 | + 'Country.CNT_name' => array('LIKE', $sstr), |
|
2278 | + 'State.STA_name' => array('LIKE', $sstr), |
|
2279 | + 'ATT_phone' => array('LIKE', $sstr), |
|
2280 | + 'Registration.REG_final_price' => array('LIKE', $sstr), |
|
2281 | + 'Registration.REG_code' => array('LIKE', $sstr), |
|
2282 | + 'Registration.REG_count' => array('LIKE', $sstr), |
|
2283 | + 'Registration.REG_group_size' => array('LIKE', $sstr) |
|
2284 | 2284 | ); |
2285 | 2285 | } |
2286 | 2286 | |
2287 | 2287 | |
2288 | - $offset = ($current_page-1)*$per_page; |
|
2289 | - $limit = $count ? NULL : array( $offset, $per_page ); |
|
2288 | + $offset = ($current_page - 1) * $per_page; |
|
2289 | + $limit = $count ? NULL : array($offset, $per_page); |
|
2290 | 2290 | |
2291 | - if ( $trash ) { |
|
2292 | - $_where['status'] = array( '!=', 'publish' ); |
|
2293 | - $all_attendees = $count ? $ATT_MDL->count( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)): $ATT_MDL->get_all( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)); |
|
2291 | + if ($trash) { |
|
2292 | + $_where['status'] = array('!=', 'publish'); |
|
2293 | + $all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)); |
|
2294 | 2294 | } else { |
2295 | - $_where['status'] = array( 'IN', array( 'publish' ) ); |
|
2296 | - $all_attendees = $count ? $ATT_MDL->count( array($_where, 'order_by'=>array($orderby=>$sort),'limit'=>$limit)) : $ATT_MDL->get_all( array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit) ); |
|
2295 | + $_where['status'] = array('IN', array('publish')); |
|
2296 | + $all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)); |
|
2297 | 2297 | } |
2298 | 2298 | |
2299 | 2299 | return $all_attendees; |
@@ -2310,10 +2310,10 @@ discard block |
||
2310 | 2310 | */ |
2311 | 2311 | protected function _resend_registration() { |
2312 | 2312 | $this->_process_resend_registration(); |
2313 | - $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'] ) : array( |
|
2313 | + $query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID']) : array( |
|
2314 | 2314 | 'action' => 'default' |
2315 | 2315 | ); |
2316 | - $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE ); |
|
2316 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2317 | 2317 | } |
2318 | 2318 | |
2319 | 2319 | |
@@ -2321,27 +2321,27 @@ discard block |
||
2321 | 2321 | |
2322 | 2322 | |
2323 | 2323 | |
2324 | - public function _registrations_report(){ |
|
2325 | - if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) { |
|
2326 | - wp_redirect( EE_Admin_Page::add_query_args_and_nonce( |
|
2324 | + public function _registrations_report() { |
|
2325 | + if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) { |
|
2326 | + wp_redirect(EE_Admin_Page::add_query_args_and_nonce( |
|
2327 | 2327 | array( |
2328 | 2328 | 'page' => 'espresso_batch', |
2329 | 2329 | 'batch' => 'file', |
2330 | - 'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL, |
|
2331 | - 'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' ), |
|
2332 | - 'return_url' => urlencode( $this->_req_data[ 'return_url' ] ), |
|
2333 | - )) ); |
|
2330 | + 'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL, |
|
2331 | + 'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'), |
|
2332 | + 'return_url' => urlencode($this->_req_data['return_url']), |
|
2333 | + ))); |
|
2334 | 2334 | } else { |
2335 | - EE_Registry::instance()->load_helper( 'File' ); |
|
2335 | + EE_Registry::instance()->load_helper('File'); |
|
2336 | 2336 | $new_request_args = array( |
2337 | 2337 | 'export' => 'report', |
2338 | 2338 | 'action' => 'registrations_report_for_event', |
2339 | - 'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL, |
|
2339 | + 'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL, |
|
2340 | 2340 | ); |
2341 | 2341 | $this->_req_data = array_merge($this->_req_data, $new_request_args); |
2342 | 2342 | |
2343 | - if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) { |
|
2344 | - require_once(EE_CLASSES . 'EE_Export.class.php'); |
|
2343 | + if (is_readable(EE_CLASSES.'EE_Export.class.php')) { |
|
2344 | + require_once(EE_CLASSES.'EE_Export.class.php'); |
|
2345 | 2345 | $EE_Export = EE_Export::instance($this->_req_data); |
2346 | 2346 | $EE_Export->export(); |
2347 | 2347 | } |
@@ -2350,28 +2350,28 @@ discard block |
||
2350 | 2350 | |
2351 | 2351 | |
2352 | 2352 | |
2353 | - public function _contact_list_export(){ |
|
2354 | - EE_Registry::instance()->load_helper( 'File' ); |
|
2355 | - if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) { |
|
2356 | - require_once(EE_CLASSES . 'EE_Export.class.php'); |
|
2353 | + public function _contact_list_export() { |
|
2354 | + EE_Registry::instance()->load_helper('File'); |
|
2355 | + if (is_readable(EE_CLASSES.'EE_Export.class.php')) { |
|
2356 | + require_once(EE_CLASSES.'EE_Export.class.php'); |
|
2357 | 2357 | $EE_Export = EE_Export::instance($this->_req_data); |
2358 | 2358 | $EE_Export->export_attendees(); |
2359 | 2359 | } |
2360 | 2360 | } |
2361 | 2361 | |
2362 | - public function _contact_list_report(){ |
|
2363 | - if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) { |
|
2364 | - wp_redirect( EE_Admin_Page::add_query_args_and_nonce( |
|
2362 | + public function _contact_list_report() { |
|
2363 | + if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) { |
|
2364 | + wp_redirect(EE_Admin_Page::add_query_args_and_nonce( |
|
2365 | 2365 | array( |
2366 | 2366 | 'page' => 'espresso_batch', |
2367 | 2367 | 'batch' => 'file', |
2368 | - 'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\AttendeesReport' ), |
|
2369 | - 'return_url' => urlencode( $this->_req_data[ 'return_url' ] ), |
|
2370 | - )) ); |
|
2368 | + 'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'), |
|
2369 | + 'return_url' => urlencode($this->_req_data['return_url']), |
|
2370 | + ))); |
|
2371 | 2371 | } else { |
2372 | - EE_Registry::instance()->load_helper( 'File' ); |
|
2373 | - if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) { |
|
2374 | - require_once(EE_CLASSES . 'EE_Export.class.php'); |
|
2372 | + EE_Registry::instance()->load_helper('File'); |
|
2373 | + if (is_readable(EE_CLASSES.'EE_Export.class.php')) { |
|
2374 | + require_once(EE_CLASSES.'EE_Export.class.php'); |
|
2375 | 2375 | $EE_Export = EE_Export::instance($this->_req_data); |
2376 | 2376 | $EE_Export->report_attendees(); |
2377 | 2377 | } |
@@ -2391,73 +2391,73 @@ discard block |
||
2391 | 2391 | * @return void |
2392 | 2392 | */ |
2393 | 2393 | protected function _duplicate_attendee() { |
2394 | - $action = !empty( $this->_req_data['return'] ) ? $this->_req_data['return'] : 'default'; |
|
2394 | + $action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default'; |
|
2395 | 2395 | //verify we have necessary info |
2396 | - if ( empty($this->_req_data['_REG_ID'] ) ) { |
|
2397 | - EE_Error::add_error( __('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__ ); |
|
2398 | - $query_args = array( 'action' => $action ); |
|
2396 | + if (empty($this->_req_data['_REG_ID'])) { |
|
2397 | + EE_Error::add_error(__('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__); |
|
2398 | + $query_args = array('action' => $action); |
|
2399 | 2399 | $this->_redirect_after_action('', '', '', $query_args, TRUE); |
2400 | 2400 | } |
2401 | 2401 | |
2402 | 2402 | //okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration. |
2403 | - $registration = EEM_Registration::instance()->get_one_by_ID( $this->_req_data['_REG_ID'] ); |
|
2403 | + $registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']); |
|
2404 | 2404 | $attendee = $registration->attendee(); |
2405 | 2405 | |
2406 | 2406 | //remove relation of existing attendee on registration |
2407 | - $registration->_remove_relation_to($attendee, 'Attendee' ); |
|
2407 | + $registration->_remove_relation_to($attendee, 'Attendee'); |
|
2408 | 2408 | //new attendee |
2409 | 2409 | $new_attendee = clone $attendee; |
2410 | - $new_attendee->set( 'ATT_ID', 0 ); |
|
2410 | + $new_attendee->set('ATT_ID', 0); |
|
2411 | 2411 | $new_attendee->save(); |
2412 | 2412 | |
2413 | 2413 | //add new attendee to reg |
2414 | - $registration->_add_relation_to( $new_attendee, 'Attendee'); |
|
2414 | + $registration->_add_relation_to($new_attendee, 'Attendee'); |
|
2415 | 2415 | |
2416 | - EE_Error::add_success( __('New Contact record created. Now make any edits you wish to make for this contact.', 'event_espresso') ); |
|
2416 | + EE_Error::add_success(__('New Contact record created. Now make any edits you wish to make for this contact.', 'event_espresso')); |
|
2417 | 2417 | |
2418 | 2418 | //redirect to edit page for attendee |
2419 | - $query_args = array( 'post' => $new_attendee->ID(), 'action' => 'edit_attendee' ); |
|
2419 | + $query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee'); |
|
2420 | 2420 | |
2421 | - $this->_redirect_after_action( '', '', '', $query_args, TRUE ); |
|
2421 | + $this->_redirect_after_action('', '', '', $query_args, TRUE); |
|
2422 | 2422 | } |
2423 | 2423 | |
2424 | 2424 | |
2425 | 2425 | //related to cpt routes |
2426 | 2426 | protected function _insert_update_cpt_item($post_id, $post) { |
2427 | 2427 | $success = true; |
2428 | - $attendee = EEM_Attendee::instance()->get_one_by_ID( $post_id ); |
|
2428 | + $attendee = EEM_Attendee::instance()->get_one_by_ID($post_id); |
|
2429 | 2429 | //for attendee updates |
2430 | - if ( $post->post_type = 'espresso_attendees' && !empty( $attendee ) ) { |
|
2430 | + if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) { |
|
2431 | 2431 | //note we should only be UPDATING attendees at this point. |
2432 | 2432 | $updated_fields = array( |
2433 | 2433 | 'ATT_fname' => $this->_req_data['ATT_fname'], |
2434 | 2434 | 'ATT_lname' => $this->_req_data['ATT_lname'], |
2435 | - 'ATT_full_name'=> $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'], |
|
2435 | + 'ATT_full_name'=> $this->_req_data['ATT_fname'].' '.$this->_req_data['ATT_lname'], |
|
2436 | 2436 | 'ATT_address' => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '', |
2437 | 2437 | 'ATT_address2' => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '', |
2438 | - 'ATT_city' => isset( $this->_req_data['ATT_city'] ) ? $this->_req_data['ATT_city'] : '', |
|
2439 | - 'STA_ID' => isset( $this->_req_data['STA_ID'] ) ? $this->_req_data['STA_ID'] : '', |
|
2440 | - 'CNT_ISO' => isset( $this->_req_data['CNT_ISO'] ) ? $this->_req_data['CNT_ISO'] : '', |
|
2441 | - 'ATT_zip' => isset( $this->_req_data['ATT_zip'] ) ? $this->_req_data['ATT_zip'] : '', |
|
2442 | - 'ATT_email' => isset( $this->_req_data['ATT_email'] ) ? $this->_req_data['ATT_email'] : '', |
|
2443 | - 'ATT_phone' => isset( $this->_req_data['ATT_phone'] ) ? $this->_req_data['ATT_phone'] : '' |
|
2438 | + 'ATT_city' => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '', |
|
2439 | + 'STA_ID' => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '', |
|
2440 | + 'CNT_ISO' => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '', |
|
2441 | + 'ATT_zip' => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '', |
|
2442 | + 'ATT_email' => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '', |
|
2443 | + 'ATT_phone' => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : '' |
|
2444 | 2444 | ); |
2445 | - foreach ( $updated_fields as $field => $value ) { |
|
2445 | + foreach ($updated_fields as $field => $value) { |
|
2446 | 2446 | $attendee->set($field, $value); |
2447 | 2447 | } |
2448 | 2448 | |
2449 | 2449 | $success = $attendee->save(); |
2450 | 2450 | |
2451 | - $attendee_update_callbacks = apply_filters( 'FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array() ); |
|
2452 | - foreach ( $attendee_update_callbacks as $a_callback ) { |
|
2453 | - if ( FALSE === call_user_func_array( $a_callback, array($attendee, $this->_req_data ) ) ) { |
|
2454 | - throw new EE_Error( sprintf( __('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback. Please check the spelling.', 'event_espresso'), $a_callback ) ); |
|
2451 | + $attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array()); |
|
2452 | + foreach ($attendee_update_callbacks as $a_callback) { |
|
2453 | + if (FALSE === call_user_func_array($a_callback, array($attendee, $this->_req_data))) { |
|
2454 | + throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback. Please check the spelling.', 'event_espresso'), $a_callback)); |
|
2455 | 2455 | } |
2456 | 2456 | } |
2457 | 2457 | } |
2458 | 2458 | |
2459 | - if ( $success === FALSE ) |
|
2460 | - EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
2459 | + if ($success === FALSE) |
|
2460 | + EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
2461 | 2461 | |
2462 | 2462 | } |
2463 | 2463 | |
@@ -2477,17 +2477,17 @@ discard block |
||
2477 | 2477 | remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
2478 | 2478 | remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
2479 | 2479 | |
2480 | - if ( post_type_supports( 'espresso_attendees', 'excerpt') ) { |
|
2481 | - add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal' ); |
|
2480 | + if (post_type_supports('espresso_attendees', 'excerpt')) { |
|
2481 | + add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal'); |
|
2482 | 2482 | } |
2483 | 2483 | |
2484 | - if ( post_type_supports( 'espresso_attendees', 'comments') ) { |
|
2484 | + if (post_type_supports('espresso_attendees', 'comments')) { |
|
2485 | 2485 | add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
2486 | 2486 | } |
2487 | 2487 | |
2488 | - add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array( $this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core' ); |
|
2489 | - add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core' ); |
|
2490 | - add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array( $this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high'); |
|
2488 | + add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core'); |
|
2489 | + add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
|
2490 | + add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high'); |
|
2491 | 2491 | } |
2492 | 2492 | |
2493 | 2493 | |
@@ -2496,10 +2496,10 @@ discard block |
||
2496 | 2496 | * @param WP_Post $post wp post object |
2497 | 2497 | * @return string attendee contact info ( and form ) |
2498 | 2498 | */ |
2499 | - public function attendee_contact_info( $post ) { |
|
2499 | + public function attendee_contact_info($post) { |
|
2500 | 2500 | //get attendee object ( should already have it ) |
2501 | 2501 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
2502 | - $template = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php'; |
|
2502 | + $template = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php'; |
|
2503 | 2503 | EEH_Template::display_template($template, $this->_template_args); |
2504 | 2504 | } |
2505 | 2505 | |
@@ -2515,12 +2515,12 @@ discard block |
||
2515 | 2515 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
2516 | 2516 | $this->_template_args['state_html'] = EEH_Form_Fields::generate_form_input( |
2517 | 2517 | new EE_Question_Form_Input( |
2518 | - EE_Question::new_instance( array( |
|
2518 | + EE_Question::new_instance(array( |
|
2519 | 2519 | 'QST_ID' => 0, |
2520 | 2520 | 'QST_display_text' => __('State/Province', 'event_espresso'), |
2521 | 2521 | 'QST_system' => 'admin-state' |
2522 | 2522 | )), |
2523 | - EE_Answer::new_instance( array( |
|
2523 | + EE_Answer::new_instance(array( |
|
2524 | 2524 | 'ANS_ID' => 0, |
2525 | 2525 | 'ANS_value' => $this->_cpt_model_obj->state_ID() |
2526 | 2526 | )), |
@@ -2533,12 +2533,12 @@ discard block |
||
2533 | 2533 | )); |
2534 | 2534 | $this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input( |
2535 | 2535 | new EE_Question_Form_Input( |
2536 | - EE_Question::new_instance( array( |
|
2536 | + EE_Question::new_instance(array( |
|
2537 | 2537 | 'QST_ID' => 0, |
2538 | 2538 | 'QST_display_text' => __('Country', 'event_espresso'), |
2539 | 2539 | 'QST_system' => 'admin-country' |
2540 | 2540 | )), |
2541 | - EE_Answer::new_instance( array( |
|
2541 | + EE_Answer::new_instance(array( |
|
2542 | 2542 | 'ANS_ID' => 0, |
2543 | 2543 | 'ANS_value' => $this->_cpt_model_obj->country_ID() |
2544 | 2544 | )), |
@@ -2549,8 +2549,8 @@ discard block |
||
2549 | 2549 | 'append_qstn_id' => FALSE |
2550 | 2550 | ) |
2551 | 2551 | )); |
2552 | - $template = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php'; |
|
2553 | - EEH_Template::display_template($template, $this->_template_args ); |
|
2552 | + $template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php'; |
|
2553 | + EEH_Template::display_template($template, $this->_template_args); |
|
2554 | 2554 | |
2555 | 2555 | } |
2556 | 2556 | |
@@ -2560,11 +2560,11 @@ discard block |
||
2560 | 2560 | * @access protected |
2561 | 2561 | * @return void |
2562 | 2562 | */ |
2563 | - public function attendee_registrations_meta_box( $post ) { |
|
2563 | + public function attendee_registrations_meta_box($post) { |
|
2564 | 2564 | |
2565 | 2565 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
2566 | 2566 | $this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration'); |
2567 | - $template = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php'; |
|
2567 | + $template = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php'; |
|
2568 | 2568 | EEH_Template::display_template($template, $this->_template_args); |
2569 | 2569 | |
2570 | 2570 | } |
@@ -2578,8 +2578,8 @@ discard block |
||
2578 | 2578 | * @return string html for new form. |
2579 | 2579 | */ |
2580 | 2580 | public function after_title_form_fields($post) { |
2581 | - if ( $post->post_type == 'espresso_attendees' ) { |
|
2582 | - $template = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php'; |
|
2581 | + if ($post->post_type == 'espresso_attendees') { |
|
2582 | + $template = REG_TEMPLATE_PATH.'attendee_details_after_title_form_fields.template.php'; |
|
2583 | 2583 | $template_args['attendee'] = $this->_cpt_model_obj; |
2584 | 2584 | EEH_Template::display_template($template, $template_args); |
2585 | 2585 | } |
@@ -2596,21 +2596,21 @@ discard block |
||
2596 | 2596 | * @access protected |
2597 | 2597 | * @return void |
2598 | 2598 | */ |
2599 | - protected function _trash_or_restore_attendees( $trash = TRUE ) { |
|
2599 | + protected function _trash_or_restore_attendees($trash = TRUE) { |
|
2600 | 2600 | |
2601 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2601 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2602 | 2602 | |
2603 | 2603 | $ATT_MDL = EEM_Attendee::instance(); |
2604 | 2604 | |
2605 | 2605 | $success = 1; |
2606 | 2606 | //Checkboxes |
2607 | - if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
2607 | + if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
2608 | 2608 | // if array has more than one element than success message should be plural |
2609 | - $success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1; |
|
2609 | + $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1; |
|
2610 | 2610 | // cycle thru checkboxes |
2611 | - while (list( $ATT_ID, $value ) = each($this->_req_data['checkbox'])) { |
|
2612 | - $updated = $trash ? $ATT_MDL->update_by_ID(array( 'status' => 'trash' ), $ATT_ID) : $ATT_MDL->update_by_ID( array('status' => 'publish' ), $ATT_ID); |
|
2613 | - if ( !$updated ) { |
|
2611 | + while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) { |
|
2612 | + $updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID) : $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID); |
|
2613 | + if ( ! $updated) { |
|
2614 | 2614 | $success = 0; |
2615 | 2615 | } |
2616 | 2616 | } |
@@ -2619,18 +2619,18 @@ discard block |
||
2619 | 2619 | // grab single id and delete |
2620 | 2620 | $ATT_ID = absint($this->_req_data['ATT_ID']); |
2621 | 2621 | //get attendee |
2622 | - $att = $ATT_MDL->get_one_by_ID( $ATT_ID ); |
|
2622 | + $att = $ATT_MDL->get_one_by_ID($ATT_ID); |
|
2623 | 2623 | $updated = $trash ? $att->set_status('trash') : $att->set_status('publish'); |
2624 | 2624 | $updated = $att->save(); |
2625 | - if ( ! $updated ) { |
|
2625 | + if ( ! $updated) { |
|
2626 | 2626 | $success = 0; |
2627 | 2627 | } |
2628 | 2628 | |
2629 | 2629 | } |
2630 | 2630 | |
2631 | - $what = $success > 1 ? __( 'Contacts', 'event_espresso' ) : __( 'Contact', 'event_espresso' ); |
|
2632 | - $action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' ); |
|
2633 | - $this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'contact_list' ) ); |
|
2631 | + $what = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso'); |
|
2632 | + $action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso'); |
|
2633 | + $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list')); |
|
2634 | 2634 | |
2635 | 2635 | } |
2636 | 2636 |
@@ -1,29 +1,29 @@ discard block |
||
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 | - */ |
|
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 | 16 | /** |
17 | - * ------------------------------------------------------------------------ |
|
18 | - * |
|
19 | - * Ticket Selector class |
|
20 | - * |
|
21 | - * @package Event Espresso |
|
22 | - * @subpackage includes/classes/EE_Ticket_Selector.class.php |
|
23 | - * @author Brent Christensen |
|
24 | - * |
|
25 | - * ------------------------------------------------------------------------ |
|
26 | - */ |
|
17 | + * ------------------------------------------------------------------------ |
|
18 | + * |
|
19 | + * Ticket Selector class |
|
20 | + * |
|
21 | + * @package Event Espresso |
|
22 | + * @subpackage includes/classes/EE_Ticket_Selector.class.php |
|
23 | + * @author Brent Christensen |
|
24 | + * |
|
25 | + * ------------------------------------------------------------------------ |
|
26 | + */ |
|
27 | 27 | class EED_Ticket_Selector extends EED_Module { |
28 | 28 | |
29 | 29 | /** |
@@ -35,11 +35,11 @@ discard block |
||
35 | 35 | protected static $_event = NULL; |
36 | 36 | |
37 | 37 | /** |
38 | - * array of datetimes and the spaces available for them |
|
39 | - * |
|
40 | - * @access private |
|
41 | - * @var array |
|
42 | - */ |
|
38 | + * array of datetimes and the spaces available for them |
|
39 | + * |
|
40 | + * @access private |
|
41 | + * @var array |
|
42 | + */ |
|
43 | 43 | private static $_available_spaces = array(); |
44 | 44 | |
45 | 45 | |
@@ -887,11 +887,11 @@ discard block |
||
887 | 887 | |
888 | 888 | |
889 | 889 | /** |
890 | - * load js |
|
891 | - * |
|
892 | - * @access public |
|
893 | - * @return void |
|
894 | - */ |
|
890 | + * load js |
|
891 | + * |
|
892 | + * @access public |
|
893 | + * @return void |
|
894 | + */ |
|
895 | 895 | public static function load_tckt_slctr_assets() { |
896 | 896 | // add some style |
897 | 897 | if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) { |
@@ -57,15 +57,15 @@ discard block |
||
57 | 57 | * @return EED_Ticket_Selector |
58 | 58 | */ |
59 | 59 | public static function instance() { |
60 | - return parent::get_instance( __CLASS__ ); |
|
60 | + return parent::get_instance(__CLASS__); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
64 | 64 | |
65 | - protected function set_config(){ |
|
66 | - $this->set_config_section( 'template_settings' ); |
|
67 | - $this->set_config_class( 'EE_Ticket_Selector_Config' ); |
|
68 | - $this->set_config_name( 'EED_Ticket_Selector' ); |
|
65 | + protected function set_config() { |
|
66 | + $this->set_config_section('template_settings'); |
|
67 | + $this->set_config_class('EE_Ticket_Selector_Config'); |
|
68 | + $this->set_config_name('EED_Ticket_Selector'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | |
@@ -80,14 +80,14 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public static function set_hooks() { |
82 | 82 | // routing |
83 | - EE_Config::register_route( 'iframe', 'EED_Ticket_Selector', 'ticket_selector_iframe', 'ticket_selector' ); |
|
84 | - EE_Config::register_route( 'process_ticket_selections', 'EED_Ticket_Selector', 'process_ticket_selections' ); |
|
85 | - add_action( 'wp_loaded', array( 'EED_Ticket_Selector', 'set_definitions' ), 2 ); |
|
83 | + EE_Config::register_route('iframe', 'EED_Ticket_Selector', 'ticket_selector_iframe', 'ticket_selector'); |
|
84 | + EE_Config::register_route('process_ticket_selections', 'EED_Ticket_Selector', 'process_ticket_selections'); |
|
85 | + add_action('wp_loaded', array('EED_Ticket_Selector', 'set_definitions'), 2); |
|
86 | 86 | //add_action( 'AHEE_event_details_before_post', array( 'EED_Ticket_Selector', 'ticket_selector_form_open' ), 10, 1 ); |
87 | - add_action( 'AHEE_event_details_header_bottom', array( 'EED_Ticket_Selector', 'display_ticket_selector' ), 10, 1 ); |
|
87 | + add_action('AHEE_event_details_header_bottom', array('EED_Ticket_Selector', 'display_ticket_selector'), 10, 1); |
|
88 | 88 | //add_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', array( 'EED_Ticket_Selector', 'display_ticket_selector_submit' ), 10, 1 ); |
89 | 89 | //add_action( 'AHEE_event_details_after_post', array( 'EED_Ticket_Selector', 'ticket_selector_form_close' ), 10 ); |
90 | - add_action( 'wp_enqueue_scripts', array( 'EED_Ticket_Selector', 'load_tckt_slctr_assets' ), 10 ); |
|
90 | + add_action('wp_enqueue_scripts', array('EED_Ticket_Selector', 'load_tckt_slctr_assets'), 10); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | |
@@ -99,10 +99,10 @@ discard block |
||
99 | 99 | * @return void |
100 | 100 | */ |
101 | 101 | public static function set_hooks_admin() { |
102 | - add_action( 'wp_loaded', array( 'EED_Ticket_Selector', 'set_definitions' ), 2 ); |
|
102 | + add_action('wp_loaded', array('EED_Ticket_Selector', 'set_definitions'), 2); |
|
103 | 103 | //add button for iframe code to event editor. |
104 | - add_filter( 'get_sample_permalink_html', array( 'EED_Ticket_Selector', 'iframe_code_button' ), 10, 4 ); |
|
105 | - add_action( 'admin_enqueue_scripts', array( 'EED_Ticket_Selector', 'load_tckt_slctr_assets_admin' ), 10 ); |
|
104 | + add_filter('get_sample_permalink_html', array('EED_Ticket_Selector', 'iframe_code_button'), 10, 4); |
|
105 | + add_action('admin_enqueue_scripts', array('EED_Ticket_Selector', 'load_tckt_slctr_assets_admin'), 10); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | |
@@ -114,15 +114,15 @@ discard block |
||
114 | 114 | * @return void |
115 | 115 | */ |
116 | 116 | public static function set_definitions() { |
117 | - define( 'TICKET_SELECTOR_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS ); |
|
118 | - define( 'TICKET_SELECTOR_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS ); |
|
117 | + define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS); |
|
118 | + define('TICKET_SELECTOR_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS); |
|
119 | 119 | |
120 | 120 | //if config is not set, initialize |
121 | 121 | //If config is not set, set it. |
122 | - if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector ) ) { |
|
122 | + if ( ! isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector)) { |
|
123 | 123 | EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = new EE_Ticket_Selector_Config(); |
124 | 124 | } |
125 | - EE_Registry::$i18n_js_strings[ 'ts_embed_iframe_title' ] = __( 'Copy and Paste the following:', 'event_espresso' ); |
|
125 | + EE_Registry::$i18n_js_strings['ts_embed_iframe_title'] = __('Copy and Paste the following:', 'event_espresso'); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @param object $WP |
134 | 134 | * @return void |
135 | 135 | */ |
136 | - public function run( $WP ) {} |
|
136 | + public function run($WP) {} |
|
137 | 137 | |
138 | 138 | |
139 | 139 | /** |
@@ -145,23 +145,23 @@ discard block |
||
145 | 145 | public function ticket_selector_iframe() { |
146 | 146 | self::$_in_iframe = true; |
147 | 147 | /** @type EEM_Event $EEM_Event */ |
148 | - $EEM_Event = EE_Registry::instance()->load_model( 'Event' ); |
|
148 | + $EEM_Event = EE_Registry::instance()->load_model('Event'); |
|
149 | 149 | $event = $EEM_Event->get_one_by_ID( |
150 | - EE_Registry::instance()->REQ->get( 'event', 0 ) |
|
150 | + EE_Registry::instance()->REQ->get('event', 0) |
|
151 | 151 | ); |
152 | - EE_Registry::instance()->REQ->set_espresso_page( true ); |
|
153 | - $template_args['ticket_selector'] = EED_Ticket_Selector::display_ticket_selector( $event ); |
|
152 | + EE_Registry::instance()->REQ->set_espresso_page(true); |
|
153 | + $template_args['ticket_selector'] = EED_Ticket_Selector::display_ticket_selector($event); |
|
154 | 154 | $template_args['css'] = apply_filters( |
155 | 155 | 'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css', |
156 | 156 | array( |
157 | - TICKET_SELECTOR_ASSETS_URL . 'ticket_selector_embed.css?ver=' . EVENT_ESPRESSO_VERSION, |
|
158 | - TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css?ver=' . EVENT_ESPRESSO_VERSION, |
|
159 | - includes_url( 'css/dashicons.min.css?ver=' . $GLOBALS['wp_version'] ), |
|
160 | - EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION |
|
157 | + TICKET_SELECTOR_ASSETS_URL.'ticket_selector_embed.css?ver='.EVENT_ESPRESSO_VERSION, |
|
158 | + TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css?ver='.EVENT_ESPRESSO_VERSION, |
|
159 | + includes_url('css/dashicons.min.css?ver='.$GLOBALS['wp_version']), |
|
160 | + EE_GLOBAL_ASSETS_URL.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION |
|
161 | 161 | ) |
162 | 162 | ); |
163 | - EE_Registry::$i18n_js_strings[ 'ticket_selector_iframe' ] = true; |
|
164 | - EE_Registry::$i18n_js_strings[ 'EEDTicketSelectorMsg' ] = __( 'Please choose at least one ticket before continuing.', 'event_espresso' ); |
|
163 | + EE_Registry::$i18n_js_strings['ticket_selector_iframe'] = true; |
|
164 | + EE_Registry::$i18n_js_strings['EEDTicketSelectorMsg'] = __('Please choose at least one ticket before continuing.', 'event_espresso'); |
|
165 | 165 | $template_args['eei18n'] = apply_filters( |
166 | 166 | 'FHEE__EED_Ticket_Selector__ticket_selector_iframe__eei18n_js_strings', |
167 | 167 | EE_Registry::localize_i18n_js_strings() |
@@ -169,19 +169,19 @@ discard block |
||
169 | 169 | $template_args['js'] = apply_filters( |
170 | 170 | 'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js', |
171 | 171 | array( |
172 | - includes_url( 'js/jquery/jquery.js?ver=' . $GLOBALS['wp_version'] ), |
|
173 | - EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js?ver=' . EVENT_ESPRESSO_VERSION, |
|
174 | - TICKET_SELECTOR_ASSETS_URL . 'ticket_selector_iframe_embed.js?ver=' . EVENT_ESPRESSO_VERSION |
|
172 | + includes_url('js/jquery/jquery.js?ver='.$GLOBALS['wp_version']), |
|
173 | + EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js?ver='.EVENT_ESPRESSO_VERSION, |
|
174 | + TICKET_SELECTOR_ASSETS_URL.'ticket_selector_iframe_embed.js?ver='.EVENT_ESPRESSO_VERSION |
|
175 | 175 | ) |
176 | 176 | ); |
177 | 177 | EE_Registry::instance()->load_helper('Template'); |
178 | - $template_args[ 'notices' ] = EEH_Template::display_template( |
|
179 | - EE_TEMPLATES . 'espresso-ajax-notices.template.php', |
|
178 | + $template_args['notices'] = EEH_Template::display_template( |
|
179 | + EE_TEMPLATES.'espresso-ajax-notices.template.php', |
|
180 | 180 | array(), |
181 | 181 | true |
182 | 182 | ); |
183 | 183 | EEH_Template::display_template( |
184 | - TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_selector_chart_iframe.template.php', |
|
184 | + TICKET_SELECTOR_TEMPLATES_PATH.'ticket_selector_chart_iframe.template.php', |
|
185 | 185 | $template_args |
186 | 186 | ); |
187 | 187 | exit; |
@@ -200,23 +200,23 @@ discard block |
||
200 | 200 | * |
201 | 201 | * @return string The new html string for the permalink area. |
202 | 202 | */ |
203 | - public static function iframe_code_button( $permalink_string, $id, $new_title, $new_slug ) { |
|
203 | + public static function iframe_code_button($permalink_string, $id, $new_title, $new_slug) { |
|
204 | 204 | //make sure this is ONLY when editing and the event id has been set. |
205 | - if ( ! empty( $id ) ) { |
|
206 | - $post = get_post( $id ); |
|
205 | + if ( ! empty($id)) { |
|
206 | + $post = get_post($id); |
|
207 | 207 | |
208 | 208 | //if NOT event then let's get out. |
209 | - if ( $post->post_type !== 'espresso_events' ) { |
|
209 | + if ($post->post_type !== 'espresso_events') { |
|
210 | 210 | return $permalink_string; |
211 | 211 | } |
212 | 212 | |
213 | - $ticket_selector_url = add_query_arg( array( 'ticket_selector' => 'iframe', 'event' => $id ), site_url() ); |
|
213 | + $ticket_selector_url = add_query_arg(array('ticket_selector' => 'iframe', 'event' => $id), site_url()); |
|
214 | 214 | |
215 | - $permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#" tabindex="-1">' . __('Embed', 'event_espresso') . '</a> '; |
|
215 | + $permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#" tabindex="-1">'.__('Embed', 'event_espresso').'</a> '; |
|
216 | 216 | $permalink_string .= ' |
217 | 217 | <div id="js-ts-iframe" style="display:none"> |
218 | 218 | <div style="width:100%; height: 500px;"> |
219 | - <iframe src="' . $ticket_selector_url . '" width="100%" height="100%"></iframe> |
|
219 | + <iframe src="' . $ticket_selector_url.'" width="100%" height="100%"></iframe> |
|
220 | 220 | </div> |
221 | 221 | </div>'; |
222 | 222 | } |
@@ -235,22 +235,22 @@ discard block |
||
235 | 235 | * @param mixed $event |
236 | 236 | * @return bool |
237 | 237 | */ |
238 | - protected static function set_event( $event = null ) { |
|
239 | - if( $event === null ) { |
|
238 | + protected static function set_event($event = null) { |
|
239 | + if ($event === null) { |
|
240 | 240 | global $post; |
241 | 241 | $event = $post; |
242 | 242 | } |
243 | - if ( $event instanceof EE_Event ) { |
|
243 | + if ($event instanceof EE_Event) { |
|
244 | 244 | self::$_event = $event; |
245 | - } else if ( $event instanceof WP_Post && isset( $event->EE_Event ) && $event->EE_Event instanceof EE_Event ) { |
|
245 | + } else if ($event instanceof WP_Post && isset($event->EE_Event) && $event->EE_Event instanceof EE_Event) { |
|
246 | 246 | self::$_event = $event->EE_Event; |
247 | - } else if ( $event instanceof WP_Post && $event->post_type == 'espresso_events' ) { |
|
248 | - $event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object( $event ); |
|
247 | + } else if ($event instanceof WP_Post && $event->post_type == 'espresso_events') { |
|
248 | + $event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object($event); |
|
249 | 249 | self::$_event = $event->EE_Event; |
250 | 250 | } else { |
251 | - $user_msg = __( 'No Event object or an invalid Event object was supplied.', 'event_espresso' ); |
|
252 | - $dev_msg = $user_msg . __( 'In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.', 'event_espresso' ); |
|
253 | - EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
251 | + $user_msg = __('No Event object or an invalid Event object was supplied.', 'event_espresso'); |
|
252 | + $dev_msg = $user_msg.__('In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.', 'event_espresso'); |
|
253 | + EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__); |
|
254 | 254 | return false; |
255 | 255 | } |
256 | 256 | return true; |
@@ -269,11 +269,11 @@ discard block |
||
269 | 269 | * @param bool $view_details |
270 | 270 | * @return string |
271 | 271 | */ |
272 | - public static function display_ticket_selector( $event = NULL, $view_details = FALSE ) { |
|
272 | + public static function display_ticket_selector($event = NULL, $view_details = FALSE) { |
|
273 | 273 | // reset filter for displaying submit button |
274 | - remove_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' ); |
|
274 | + remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true'); |
|
275 | 275 | // poke and prod incoming event till it tells us what it is |
276 | - if ( ! EED_Ticket_Selector::set_event( $event )) { |
|
276 | + if ( ! EED_Ticket_Selector::set_event($event)) { |
|
277 | 277 | return false; |
278 | 278 | } |
279 | 279 | $event_post = self::$_event instanceof EE_Event ? self::$_event->ID() : $event; |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | && ( |
285 | 285 | ! self::$_event->display_ticket_selector() |
286 | 286 | || $view_details |
287 | - || post_password_required( $event_post ) |
|
287 | + || post_password_required($event_post) |
|
288 | 288 | || ( |
289 | 289 | $_event_active_status != EE_Datetime::active |
290 | 290 | && $_event_active_status != EE_Datetime::upcoming |
@@ -302,70 +302,70 @@ discard block |
||
302 | 302 | $template_args = array(); |
303 | 303 | $template_args['event_status'] = $_event_active_status; |
304 | 304 | |
305 | - $template_args['date_format'] = apply_filters( 'FHEE__EED_Ticket_Selector__display_ticket_selector__date_format', get_option( 'date_format' ) ); |
|
306 | - $template_args['time_format'] = apply_filters( 'FHEE__EED_Ticket_Selector__display_ticket_selector__time_format', get_option( 'time_format' ) ); |
|
305 | + $template_args['date_format'] = apply_filters('FHEE__EED_Ticket_Selector__display_ticket_selector__date_format', get_option('date_format')); |
|
306 | + $template_args['time_format'] = apply_filters('FHEE__EED_Ticket_Selector__display_ticket_selector__time_format', get_option('time_format')); |
|
307 | 307 | |
308 | 308 | $template_args['EVT_ID'] = self::$_event->ID(); |
309 | 309 | $template_args['event'] = self::$_event; |
310 | 310 | |
311 | 311 | // is the event expired ? |
312 | 312 | $template_args['event_is_expired'] = self::$_event->is_expired(); |
313 | - if ( $template_args['event_is_expired'] ) { |
|
314 | - return '<div class="ee-event-expired-notice"><span class="important-notice">' . __( 'We\'re sorry, but all tickets sales have ended because the event is expired.', 'event_espresso' ) . '</span></div>'; |
|
313 | + if ($template_args['event_is_expired']) { |
|
314 | + return '<div class="ee-event-expired-notice"><span class="important-notice">'.__('We\'re sorry, but all tickets sales have ended because the event is expired.', 'event_espresso').'</span></div>'; |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | $ticket_query_args = array( |
318 | - array( 'Datetime.EVT_ID' => self::$_event->ID() ), |
|
319 | - 'order_by' => array( 'TKT_order' => 'ASC', 'TKT_required' => 'DESC', 'TKT_start_date' => 'ASC', 'TKT_end_date' => 'ASC' , 'Datetime.DTT_EVT_start' => 'DESC' ) |
|
318 | + array('Datetime.EVT_ID' => self::$_event->ID()), |
|
319 | + 'order_by' => array('TKT_order' => 'ASC', 'TKT_required' => 'DESC', 'TKT_start_date' => 'ASC', 'TKT_end_date' => 'ASC', 'Datetime.DTT_EVT_start' => 'DESC') |
|
320 | 320 | ); |
321 | 321 | |
322 | - if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets ) { |
|
322 | + if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets) { |
|
323 | 323 | //use the correct applicable time query depending on what version of core is being run. |
324 | - $current_time = method_exists( 'EEM_Datetime', 'current_time_for_query' ) ? time() : current_time('timestamp'); |
|
325 | - $ticket_query_args[0]['TKT_end_date'] = array( '>', $current_time ); |
|
324 | + $current_time = method_exists('EEM_Datetime', 'current_time_for_query') ? time() : current_time('timestamp'); |
|
325 | + $ticket_query_args[0]['TKT_end_date'] = array('>', $current_time); |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | // get all tickets for this event ordered by the datetime |
329 | - $template_args['tickets'] = EEM_Ticket::instance()->get_all( $ticket_query_args ); |
|
329 | + $template_args['tickets'] = EEM_Ticket::instance()->get_all($ticket_query_args); |
|
330 | 330 | |
331 | - if ( count( $template_args['tickets'] ) < 1 ) { |
|
332 | - return '<div class="ee-event-expired-notice"><span class="important-notice">' . __( 'We\'re sorry, but all ticket sales have ended.', 'event_espresso' ) . '</span></div>'; |
|
331 | + if (count($template_args['tickets']) < 1) { |
|
332 | + return '<div class="ee-event-expired-notice"><span class="important-notice">'.__('We\'re sorry, but all ticket sales have ended.', 'event_espresso').'</span></div>'; |
|
333 | 333 | } |
334 | 334 | |
335 | 335 | // filter the maximum qty that can appear in the Ticket Selector qty dropdowns |
336 | - $template_args['max_atndz'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets', self::$_event->additional_limit() ); |
|
337 | - if ( $template_args['max_atndz'] < 1 ) { |
|
338 | - $sales_closed_msg = __( 'We\'re sorry, but ticket sales have been closed at this time. Please check back again later.', 'event_espresso' ); |
|
339 | - if ( current_user_can( 'edit_post', self::$_event->ID() )) { |
|
340 | - $sales_closed_msg .= sprintf( |
|
341 | - __( '%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s', 'event_espresso' ), |
|
336 | + $template_args['max_atndz'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets', self::$_event->additional_limit()); |
|
337 | + if ($template_args['max_atndz'] < 1) { |
|
338 | + $sales_closed_msg = __('We\'re sorry, but ticket sales have been closed at this time. Please check back again later.', 'event_espresso'); |
|
339 | + if (current_user_can('edit_post', self::$_event->ID())) { |
|
340 | + $sales_closed_msg .= sprintf( |
|
341 | + __('%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s', 'event_espresso'), |
|
342 | 342 | '<div class="ee-attention" style="text-align: left;"><b>', |
343 | 343 | '</b><br />', |
344 | - $link = '<span class="edit-link"><a class="post-edit-link" href="' . get_edit_post_link( self::$_event->ID() ) . '">', |
|
344 | + $link = '<span class="edit-link"><a class="post-edit-link" href="'.get_edit_post_link(self::$_event->ID()).'">', |
|
345 | 345 | '</a></span></div>' |
346 | 346 | ); |
347 | 347 | } |
348 | - return '<p><span class="important-notice">' . $sales_closed_msg . '</span></p>'; |
|
348 | + return '<p><span class="important-notice">'.$sales_closed_msg.'</span></p>'; |
|
349 | 349 | } |
350 | 350 | |
351 | - $templates['ticket_selector'] = TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_selector_chart.template.php'; |
|
352 | - $templates['ticket_selector'] = apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path', $templates['ticket_selector'], self::$_event ); |
|
351 | + $templates['ticket_selector'] = TICKET_SELECTOR_TEMPLATES_PATH.'ticket_selector_chart.template.php'; |
|
352 | + $templates['ticket_selector'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__template_path', $templates['ticket_selector'], self::$_event); |
|
353 | 353 | |
354 | 354 | // redirecting to another site for registration ?? |
355 | 355 | $external_url = self::$_event->external_url() !== NULL || self::$_event->external_url() !== '' ? self::$_event->external_url() : FALSE; |
356 | 356 | // set up the form (but not for the admin) |
357 | - $ticket_selector = ! is_admin() ? EED_Ticket_Selector::ticket_selector_form_open( self::$_event->ID(), $external_url ) : ''; |
|
357 | + $ticket_selector = ! is_admin() ? EED_Ticket_Selector::ticket_selector_form_open(self::$_event->ID(), $external_url) : ''; |
|
358 | 358 | // if not redirecting to another site for registration |
359 | - if ( ! $external_url ) { |
|
360 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
361 | - EE_Registry::instance()->load_helper( 'URL' ); |
|
359 | + if ( ! $external_url) { |
|
360 | + EE_Registry::instance()->load_helper('Template'); |
|
361 | + EE_Registry::instance()->load_helper('URL'); |
|
362 | 362 | // then display the ticket selector |
363 | - $ticket_selector .= EEH_Template::locate_template( $templates['ticket_selector'], $template_args ); |
|
363 | + $ticket_selector .= EEH_Template::locate_template($templates['ticket_selector'], $template_args); |
|
364 | 364 | } else { |
365 | 365 | // if not we still need to trigger the display of the submit button |
366 | - add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' ); |
|
366 | + add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true'); |
|
367 | 367 | //display notice to admin that registration is external |
368 | - $ticket_selector .= ! is_admin() ? '' : __( 'Registration is at an external URL for this event.', 'event_espresso' ); |
|
368 | + $ticket_selector .= ! is_admin() ? '' : __('Registration is at an external URL for this event.', 'event_espresso'); |
|
369 | 369 | } |
370 | 370 | // submit button and form close tag |
371 | 371 | $ticket_selector .= ! is_admin() ? EED_Ticket_Selector::display_ticket_selector_submit() : ''; |
@@ -385,27 +385,27 @@ discard block |
||
385 | 385 | * @param string $external_url |
386 | 386 | * @return string |
387 | 387 | */ |
388 | - public static function ticket_selector_form_open( $ID = 0, $external_url = '' ) { |
|
388 | + public static function ticket_selector_form_open($ID = 0, $external_url = '') { |
|
389 | 389 | // if redirecting, we don't need any anything else |
390 | - if ( $external_url ) { |
|
391 | - EE_Registry::instance()->load_helper( 'URL' ); |
|
392 | - $html = '<form method="GET" action="' . EEH_URL::refactor_url( $external_url ) . '">'; |
|
393 | - $query_args = EEH_URL::get_query_string( $external_url ); |
|
394 | - foreach ( $query_args as $query_arg => $value ) { |
|
395 | - $html .= '<input type="hidden" name="' . $query_arg . '" value="' . $value . '">'; |
|
390 | + if ($external_url) { |
|
391 | + EE_Registry::instance()->load_helper('URL'); |
|
392 | + $html = '<form method="GET" action="'.EEH_URL::refactor_url($external_url).'">'; |
|
393 | + $query_args = EEH_URL::get_query_string($external_url); |
|
394 | + foreach ($query_args as $query_arg => $value) { |
|
395 | + $html .= '<input type="hidden" name="'.$query_arg.'" value="'.$value.'">'; |
|
396 | 396 | } |
397 | 397 | return $html; |
398 | 398 | } |
399 | - EE_Registry::instance()->load_helper( 'Event_View' ); |
|
400 | - $checkout_url = EEH_Event_View::event_link_url( $ID ); |
|
401 | - if ( ! $checkout_url ) { |
|
402 | - EE_Error::add_error( __('The URL for the Event Details page could not be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
399 | + EE_Registry::instance()->load_helper('Event_View'); |
|
400 | + $checkout_url = EEH_Event_View::event_link_url($ID); |
|
401 | + if ( ! $checkout_url) { |
|
402 | + EE_Error::add_error(__('The URL for the Event Details page could not be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
403 | 403 | } |
404 | 404 | $extra_params = self::$_in_iframe ? ' target="_blank"' : ''; |
405 | - $html = '<form method="POST" action="' . $checkout_url . '"' . $extra_params . '>'; |
|
406 | - $html .= wp_nonce_field( 'process_ticket_selections', 'process_ticket_selections_nonce', TRUE, FALSE ); |
|
405 | + $html = '<form method="POST" action="'.$checkout_url.'"'.$extra_params.'>'; |
|
406 | + $html .= wp_nonce_field('process_ticket_selections', 'process_ticket_selections_nonce', TRUE, FALSE); |
|
407 | 407 | $html .= '<input type="hidden" name="ee" value="process_ticket_selections">'; |
408 | - $html = apply_filters( 'FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, self::$_event ); |
|
408 | + $html = apply_filters('FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, self::$_event); |
|
409 | 409 | return $html; |
410 | 410 | } |
411 | 411 | |
@@ -420,23 +420,23 @@ discard block |
||
420 | 420 | * @return string |
421 | 421 | */ |
422 | 422 | public static function display_ticket_selector_submit() { |
423 | - if ( ! is_admin() ) { |
|
424 | - if ( apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', FALSE ) ) { |
|
423 | + if ( ! is_admin()) { |
|
424 | + if (apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', FALSE)) { |
|
425 | 425 | $btn_text = apply_filters( |
426 | 426 | 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__btn_text', |
427 | - __('Register Now', 'event_espresso' ), |
|
427 | + __('Register Now', 'event_espresso'), |
|
428 | 428 | self::$_event |
429 | 429 | ); |
430 | 430 | $external_url = self::$_event->external_url(); |
431 | - $html = '<input id="ticket-selector-submit-'. self::$_event->ID() .'-btn"'; |
|
431 | + $html = '<input id="ticket-selector-submit-'.self::$_event->ID().'-btn"'; |
|
432 | 432 | $html .= ' class="ticket-selector-submit-btn '; |
433 | - $html .= empty( $external_url ) ? 'ticket-selector-submit-ajax"' : '"'; |
|
434 | - $html .= ' type="submit" value="' . $btn_text . '" />'; |
|
435 | - $html .= apply_filters( 'FHEE__EE_Ticket_Selector__after_ticket_selector_submit', '', self::$_event ); |
|
433 | + $html .= empty($external_url) ? 'ticket-selector-submit-ajax"' : '"'; |
|
434 | + $html .= ' type="submit" value="'.$btn_text.'" />'; |
|
435 | + $html .= apply_filters('FHEE__EE_Ticket_Selector__after_ticket_selector_submit', '', self::$_event); |
|
436 | 436 | $html .= '<div class="clear"><br/></div></form>'; |
437 | 437 | return $html; |
438 | - } else if ( is_archive() ) { |
|
439 | - return EED_Ticket_Selector::ticket_selector_form_close() . EED_Ticket_Selector::display_view_details_btn(); |
|
438 | + } else if (is_archive()) { |
|
439 | + return EED_Ticket_Selector::ticket_selector_form_close().EED_Ticket_Selector::display_view_details_btn(); |
|
440 | 440 | } |
441 | 441 | } |
442 | 442 | return ''; |
@@ -468,13 +468,13 @@ discard block |
||
468 | 468 | * @return string |
469 | 469 | */ |
470 | 470 | public static function display_view_details_btn() { |
471 | - if ( ! self::$_event->get_permalink() ) { |
|
472 | - EE_Error::add_error( __('The URL for the Event Details page could not be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
471 | + if ( ! self::$_event->get_permalink()) { |
|
472 | + EE_Error::add_error(__('The URL for the Event Details page could not be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
473 | 473 | } |
474 | - $view_details_btn = '<form method="POST" action="' . self::$_event->get_permalink() . '">'; |
|
475 | - $btn_text = apply_filters( 'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text', __( 'View Details', 'event_espresso' ), self::$_event ); |
|
476 | - $view_details_btn .= '<input id="ticket-selector-submit-'. self::$_event->ID() .'-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="' . $btn_text . '" />'; |
|
477 | - $view_details_btn .= apply_filters( 'FHEE__EE_Ticket_Selector__after_view_details_btn', '', self::$_event ); |
|
474 | + $view_details_btn = '<form method="POST" action="'.self::$_event->get_permalink().'">'; |
|
475 | + $btn_text = apply_filters('FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text', __('View Details', 'event_espresso'), self::$_event); |
|
476 | + $view_details_btn .= '<input id="ticket-selector-submit-'.self::$_event->ID().'-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="'.$btn_text.'" />'; |
|
477 | + $view_details_btn .= apply_filters('FHEE__EE_Ticket_Selector__after_view_details_btn', '', self::$_event); |
|
478 | 478 | $view_details_btn .= '<div class="clear"><br/></div>'; |
479 | 479 | $view_details_btn .= '</form>'; |
480 | 480 | return $view_details_btn; |
@@ -493,11 +493,11 @@ discard block |
||
493 | 493 | * @return array or FALSE |
494 | 494 | */ |
495 | 495 | public function process_ticket_selections() { |
496 | - do_action( 'EED_Ticket_Selector__process_ticket_selections__before' ); |
|
496 | + do_action('EED_Ticket_Selector__process_ticket_selections__before'); |
|
497 | 497 | // check nonce |
498 | - if ( ! is_admin() && ( ! EE_Registry::instance()->REQ->is_set( 'process_ticket_selections_nonce' ) || ! wp_verify_nonce( EE_Registry::instance()->REQ->get( 'process_ticket_selections_nonce' ), 'process_ticket_selections' ))) { |
|
498 | + if ( ! is_admin() && ( ! EE_Registry::instance()->REQ->is_set('process_ticket_selections_nonce') || ! wp_verify_nonce(EE_Registry::instance()->REQ->get('process_ticket_selections_nonce'), 'process_ticket_selections'))) { |
|
499 | 499 | EE_Error::add_error( |
500 | - sprintf( __( 'We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ), |
|
500 | + sprintf(__('We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'), |
|
501 | 501 | __FILE__, __FUNCTION__, __LINE__ |
502 | 502 | ); |
503 | 503 | return FALSE; |
@@ -511,16 +511,16 @@ discard block |
||
511 | 511 | |
512 | 512 | //we should really only have 1 registration in the works now (ie, no MER) so clear any previous items in the cart. |
513 | 513 | // When MER happens this will probably need to be tweaked, possibly wrapped in a conditional checking for some constant defined in MER etc. |
514 | - EE_Registry::instance()->load_core( 'Session' ); |
|
514 | + EE_Registry::instance()->load_core('Session'); |
|
515 | 515 | // unless otherwise requested, clear the session |
516 | - if ( apply_filters( 'FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', TRUE )) { |
|
517 | - EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ ); |
|
516 | + if (apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', TRUE)) { |
|
517 | + EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__); |
|
518 | 518 | } |
519 | 519 | //d( EE_Registry::instance()->SSN ); |
520 | 520 | |
521 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
521 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
522 | 522 | // do we have an event id? |
523 | - if ( EE_Registry::instance()->REQ->is_set( 'tkt-slctr-event-id' ) ) { |
|
523 | + if (EE_Registry::instance()->REQ->is_set('tkt-slctr-event-id')) { |
|
524 | 524 | // validate/sanitize data |
525 | 525 | $valid = self::_validate_post_data(); |
526 | 526 | |
@@ -530,43 +530,43 @@ discard block |
||
530 | 530 | //EEH_Debug_Tools::printr( $valid[ 'max_atndz' ], 'max_atndz', __FILE__, __LINE__ ); |
531 | 531 | |
532 | 532 | //check total tickets ordered vs max number of attendees that can register |
533 | - if ( $valid['total_tickets'] > $valid['max_atndz'] ) { |
|
533 | + if ($valid['total_tickets'] > $valid['max_atndz']) { |
|
534 | 534 | |
535 | 535 | // ordering too many tickets !!! |
536 | 536 | $singular = 'You have attempted to purchase %s ticket.'; |
537 | 537 | $plural = 'You have attempted to purchase %s tickets.'; |
538 | - $limit_error_1 = sprintf( _n( $singular, $plural, $valid['total_tickets'], 'event_espresso' ), $valid['total_tickets'], $valid['total_tickets'] ); |
|
538 | + $limit_error_1 = sprintf(_n($singular, $plural, $valid['total_tickets'], 'event_espresso'), $valid['total_tickets'], $valid['total_tickets']); |
|
539 | 539 | // dev only message |
540 | 540 | $singular = 'The registration limit for this event is %s ticket per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.'; |
541 | 541 | $plural = 'The registration limit for this event is %s tickets per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.'; |
542 | - $limit_error_2 = sprintf( _n( $singular, $plural, $valid['max_atndz'], 'event_espresso' ), $valid['max_atndz'], $valid['max_atndz'] ); |
|
543 | - EE_Error::add_error( $limit_error_1 . '<br/>' . $limit_error_2, __FILE__, __FUNCTION__, __LINE__ ); |
|
542 | + $limit_error_2 = sprintf(_n($singular, $plural, $valid['max_atndz'], 'event_espresso'), $valid['max_atndz'], $valid['max_atndz']); |
|
543 | + EE_Error::add_error($limit_error_1.'<br/>'.$limit_error_2, __FILE__, __FUNCTION__, __LINE__); |
|
544 | 544 | } else { |
545 | 545 | |
546 | 546 | // all data appears to be valid |
547 | 547 | $tckts_slctd = FALSE; |
548 | 548 | $success = TRUE; |
549 | 549 | // load cart |
550 | - EE_Registry::instance()->load_core( 'Cart' ); |
|
550 | + EE_Registry::instance()->load_core('Cart'); |
|
551 | 551 | |
552 | 552 | // cycle thru the number of data rows sent from the event listing |
553 | - for ( $x = 0; $x < $valid['rows']; $x++ ) { |
|
553 | + for ($x = 0; $x < $valid['rows']; $x++) { |
|
554 | 554 | // does this row actually contain a ticket quantity? |
555 | - if ( isset( $valid['qty'][$x] ) && $valid['qty'][$x] > 0 ) { |
|
555 | + if (isset($valid['qty'][$x]) && $valid['qty'][$x] > 0) { |
|
556 | 556 | // YES we have a ticket quantity |
557 | 557 | $tckts_slctd = TRUE; |
558 | 558 | // d( $valid['ticket_obj'][$x] ); |
559 | - if ( $valid['ticket_obj'][$x] instanceof EE_Ticket ) { |
|
559 | + if ($valid['ticket_obj'][$x] instanceof EE_Ticket) { |
|
560 | 560 | // then add ticket to cart |
561 | - $ticket_added = self::_add_ticket_to_cart( $valid['ticket_obj'][$x], $valid['qty'][$x] ); |
|
561 | + $ticket_added = self::_add_ticket_to_cart($valid['ticket_obj'][$x], $valid['qty'][$x]); |
|
562 | 562 | $success = ! $ticket_added ? FALSE : $success; |
563 | - if ( EE_Error::has_error() ) { |
|
563 | + if (EE_Error::has_error()) { |
|
564 | 564 | break; |
565 | 565 | } |
566 | 566 | } else { |
567 | 567 | // nothing added to cart retrieved |
568 | 568 | EE_Error::add_error( |
569 | - sprintf( __( 'A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ), |
|
569 | + sprintf(__('A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'), |
|
570 | 570 | __FILE__, __FUNCTION__, __LINE__ |
571 | 571 | ); |
572 | 572 | } |
@@ -575,45 +575,45 @@ discard block |
||
575 | 575 | //d( EE_Registry::instance()->CART ); |
576 | 576 | //die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL REDIRECT HERE BEFORE CART UPDATE |
577 | 577 | |
578 | - if ( $tckts_slctd ) { |
|
579 | - if ( $success ) { |
|
580 | - do_action( 'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout', EE_Registry::instance()->CART, $this ); |
|
578 | + if ($tckts_slctd) { |
|
579 | + if ($success) { |
|
580 | + do_action('FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout', EE_Registry::instance()->CART, $this); |
|
581 | 581 | EE_Registry::instance()->CART->recalculate_all_cart_totals(); |
582 | - EE_Registry::instance()->CART->save_cart( FALSE ); |
|
582 | + EE_Registry::instance()->CART->save_cart(FALSE); |
|
583 | 583 | EE_Registry::instance()->SSN->update(); |
584 | 584 | //d( EE_Registry::instance()->CART ); |
585 | 585 | //die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< OR HERE TO KILL REDIRECT AFTER CART UPDATE |
586 | 586 | // just return TRUE for registrations being made from admin |
587 | - if ( is_admin() ) { |
|
587 | + if (is_admin()) { |
|
588 | 588 | return TRUE; |
589 | 589 | } |
590 | - wp_safe_redirect( apply_filters( 'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url', EE_Registry::instance()->CFG->core->reg_page_url() )); |
|
590 | + wp_safe_redirect(apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url', EE_Registry::instance()->CFG->core->reg_page_url())); |
|
591 | 591 | exit(); |
592 | 592 | |
593 | 593 | } else { |
594 | - if ( ! EE_Error::has_error() ) { |
|
594 | + if ( ! EE_Error::has_error()) { |
|
595 | 595 | // nothing added to cart |
596 | - EE_Error::add_attention( __( 'No tickets were added for the event', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
596 | + EE_Error::add_attention(__('No tickets were added for the event', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
597 | 597 | } |
598 | 598 | } |
599 | 599 | |
600 | 600 | } else { |
601 | 601 | // no ticket quantities were selected |
602 | - EE_Error::add_error( __( 'You need to select a ticket quantity before you can proceed.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
602 | + EE_Error::add_error(__('You need to select a ticket quantity before you can proceed.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
603 | 603 | } |
604 | 604 | } |
605 | 605 | //die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL BEFORE REDIRECT |
606 | 606 | // at this point, just return if registration is being made from admin |
607 | - if ( is_admin() ) { |
|
607 | + if (is_admin()) { |
|
608 | 608 | return FALSE; |
609 | 609 | } |
610 | - if ( $valid['return_url'] ) { |
|
611 | - EE_Error::get_notices( FALSE, TRUE ); |
|
612 | - wp_safe_redirect( $valid['return_url'] ); |
|
610 | + if ($valid['return_url']) { |
|
611 | + EE_Error::get_notices(FALSE, TRUE); |
|
612 | + wp_safe_redirect($valid['return_url']); |
|
613 | 613 | exit(); |
614 | - } elseif ( isset( $event_to_add['id'] )) { |
|
615 | - EE_Error::get_notices( FALSE, TRUE ); |
|
616 | - wp_safe_redirect( get_permalink( $event_to_add['id'] )); |
|
614 | + } elseif (isset($event_to_add['id'])) { |
|
615 | + EE_Error::get_notices(FALSE, TRUE); |
|
616 | + wp_safe_redirect(get_permalink($event_to_add['id'])); |
|
617 | 617 | exit(); |
618 | 618 | } else { |
619 | 619 | echo EE_Error::get_notices(); |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | } else { |
623 | 623 | // $_POST['tkt-slctr-event-id'] was not set ?!?!?!? |
624 | 624 | EE_Error::add_error( |
625 | - sprintf( __( 'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ), |
|
625 | + sprintf(__('An event id was not provided or was not received.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'), |
|
626 | 626 | __FILE__, __FUNCTION__, __LINE__ |
627 | 627 | ); |
628 | 628 | } |
@@ -640,18 +640,18 @@ discard block |
||
640 | 640 | * @return array or FALSE |
641 | 641 | */ |
642 | 642 | private static function _validate_post_data() { |
643 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
643 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
644 | 644 | |
645 | 645 | // start with an empty array() |
646 | 646 | $valid_data = array(); |
647 | 647 | // d( $_POST ); |
648 | 648 | //if event id is valid |
649 | - $id = absint( EE_Registry::instance()->REQ->get( 'tkt-slctr-event-id' )); |
|
650 | - if ( $id ) { |
|
649 | + $id = absint(EE_Registry::instance()->REQ->get('tkt-slctr-event-id')); |
|
650 | + if ($id) { |
|
651 | 651 | // grab valid id |
652 | 652 | $valid_data['id'] = $id; |
653 | 653 | // grab and sanitize return-url |
654 | - $valid_data['return_url'] = esc_url_raw( EE_Registry::instance()->REQ->get( 'tkt-slctr-return-url-' . $id )); |
|
654 | + $valid_data['return_url'] = esc_url_raw(EE_Registry::instance()->REQ->get('tkt-slctr-return-url-'.$id)); |
|
655 | 655 | // array of other form names |
656 | 656 | $inputs_to_clean = array( |
657 | 657 | 'event_id' => 'tkt-slctr-event-id', |
@@ -664,22 +664,22 @@ discard block |
||
664 | 664 | // let's track the total number of tickets ordered.' |
665 | 665 | $valid_data['total_tickets'] = 0; |
666 | 666 | // cycle through $inputs_to_clean array |
667 | - foreach ( $inputs_to_clean as $what => $input_to_clean ) { |
|
667 | + foreach ($inputs_to_clean as $what => $input_to_clean) { |
|
668 | 668 | // check for POST data |
669 | - if ( EE_Registry::instance()->REQ->is_set( $input_to_clean . $id )) { |
|
669 | + if (EE_Registry::instance()->REQ->is_set($input_to_clean.$id)) { |
|
670 | 670 | // grab value |
671 | - $input_value = EE_Registry::instance()->REQ->get( $input_to_clean . $id ); |
|
671 | + $input_value = EE_Registry::instance()->REQ->get($input_to_clean.$id); |
|
672 | 672 | switch ($what) { |
673 | 673 | |
674 | 674 | // integers |
675 | 675 | case 'event_id': |
676 | - $valid_data[$what] = absint( $input_value ); |
|
676 | + $valid_data[$what] = absint($input_value); |
|
677 | 677 | // get event via the event id we put in the form |
678 | - $valid_data['event'] = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $valid_data['event_id'] ); |
|
678 | + $valid_data['event'] = EE_Registry::instance()->load_model('Event')->get_one_by_ID($valid_data['event_id']); |
|
679 | 679 | break; |
680 | 680 | case 'rows': |
681 | 681 | case 'max_atndz': |
682 | - $valid_data[$what] = absint( $input_value ); |
|
682 | + $valid_data[$what] = absint($input_value); |
|
683 | 683 | break; |
684 | 684 | |
685 | 685 | // arrays of integers |
@@ -687,27 +687,27 @@ discard block |
||
687 | 687 | // d( $input_value ); |
688 | 688 | $row_qty = $input_value; |
689 | 689 | // if qty is coming from a radio button input, then we need to assemble an array of rows |
690 | - if( ! is_array( $row_qty )) { |
|
690 | + if ( ! is_array($row_qty)) { |
|
691 | 691 | // get number of rows |
692 | - $rows = EE_Registry::instance()->REQ->is_set( 'tkt-slctr-rows-' . $id ) ? absint( EE_Registry::instance()->REQ->get( 'tkt-slctr-rows-' . $id )) : 1; |
|
692 | + $rows = EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-'.$id) ? absint(EE_Registry::instance()->REQ->get('tkt-slctr-rows-'.$id)) : 1; |
|
693 | 693 | // d( $rows ); |
694 | 694 | // explode ints by the dash |
695 | - $row_qty = explode( '-', $row_qty ); |
|
696 | - $row = isset( $row_qty[0] ) ? ( absint( $row_qty[0] )) : 1; |
|
697 | - $qty = isset( $row_qty[1] ) ? absint( $row_qty[1] ) : 0; |
|
698 | - $row_qty = array( $row => $qty ); |
|
695 | + $row_qty = explode('-', $row_qty); |
|
696 | + $row = isset($row_qty[0]) ? (absint($row_qty[0])) : 1; |
|
697 | + $qty = isset($row_qty[1]) ? absint($row_qty[1]) : 0; |
|
698 | + $row_qty = array($row => $qty); |
|
699 | 699 | // d( $row_qty ); |
700 | - for( $x = 1; $x <= $rows; $x++ ) { |
|
701 | - if ( ! isset( $row_qty[$x] )) { |
|
700 | + for ($x = 1; $x <= $rows; $x++) { |
|
701 | + if ( ! isset($row_qty[$x])) { |
|
702 | 702 | $row_qty[$x] = 0; |
703 | 703 | } |
704 | 704 | } |
705 | 705 | } |
706 | - ksort( $row_qty ); |
|
706 | + ksort($row_qty); |
|
707 | 707 | // d( $row_qty ); |
708 | 708 | // cycle thru values |
709 | - foreach ( $row_qty as $qty ) { |
|
710 | - $qty = absint( $qty ); |
|
709 | + foreach ($row_qty as $qty) { |
|
710 | + $qty = absint($qty); |
|
711 | 711 | // sanitize as integers |
712 | 712 | $valid_data[$what][] = $qty; |
713 | 713 | $valid_data['total_tickets'] += $qty; |
@@ -718,19 +718,19 @@ discard block |
||
718 | 718 | case 'ticket_id': |
719 | 719 | $value_array = array(); |
720 | 720 | // cycle thru values |
721 | - foreach ( $input_value as $key=>$value ) { |
|
721 | + foreach ($input_value as $key=>$value) { |
|
722 | 722 | // allow only numbers, letters, spaces, commas and dashes |
723 | - $value_array[ $key ] = wp_strip_all_tags( $value ); |
|
723 | + $value_array[$key] = wp_strip_all_tags($value); |
|
724 | 724 | // get ticket via the ticket id we put in the form |
725 | - $ticket_obj = EE_Registry::instance()->load_model( 'Ticket' )->get_one_by_ID( $value ); |
|
726 | - $valid_data['ticket_obj'][ $key ] = $ticket_obj; |
|
725 | + $ticket_obj = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($value); |
|
726 | + $valid_data['ticket_obj'][$key] = $ticket_obj; |
|
727 | 727 | } |
728 | - $valid_data[ $what ] = $value_array; |
|
728 | + $valid_data[$what] = $value_array; |
|
729 | 729 | break; |
730 | 730 | |
731 | 731 | case 'return_url' : |
732 | 732 | // grab and sanitize return-url |
733 | - $valid_data[$what] = esc_url_raw( $input_value ); |
|
733 | + $valid_data[$what] = esc_url_raw($input_value); |
|
734 | 734 | break; |
735 | 735 | |
736 | 736 | } // end switch $what |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | } // end foreach $inputs_to_clean |
739 | 739 | |
740 | 740 | } else { |
741 | - EE_Error::add_error( __('The event id provided was not valid.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
741 | + EE_Error::add_error(__('The event id provided was not valid.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
742 | 742 | return FALSE; |
743 | 743 | } |
744 | 744 | |
@@ -756,28 +756,28 @@ discard block |
||
756 | 756 | * @param int $qty |
757 | 757 | * @return TRUE on success, FALSE on fail |
758 | 758 | */ |
759 | - private static function _add_ticket_to_cart( EE_Ticket $ticket = NULL, $qty = 1 ) { |
|
760 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
759 | + private static function _add_ticket_to_cart(EE_Ticket $ticket = NULL, $qty = 1) { |
|
760 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
761 | 761 | // get the number of spaces left for this datetime ticket |
762 | - $available_spaces = self::_ticket_datetime_availability( $ticket ); |
|
762 | + $available_spaces = self::_ticket_datetime_availability($ticket); |
|
763 | 763 | // compare available spaces against the number of tickets being purchased |
764 | - if ( $available_spaces >= $qty ) { |
|
764 | + if ($available_spaces >= $qty) { |
|
765 | 765 | // allow addons to prevent a ticket from being added to cart |
766 | - if ( ! apply_filters( 'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart', true, $ticket, $qty, $available_spaces ) ) { |
|
766 | + if ( ! apply_filters('FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart', true, $ticket, $qty, $available_spaces)) { |
|
767 | 767 | return false; |
768 | 768 | } |
769 | 769 | // add event to cart |
770 | - if( EE_Registry::instance()->CART->add_ticket_to_cart( $ticket, $qty )) { |
|
771 | - self::_recalculate_ticket_datetime_availability( $ticket, $qty ); |
|
770 | + if (EE_Registry::instance()->CART->add_ticket_to_cart($ticket, $qty)) { |
|
771 | + self::_recalculate_ticket_datetime_availability($ticket, $qty); |
|
772 | 772 | return true; |
773 | 773 | } else { |
774 | 774 | return false; |
775 | 775 | } |
776 | 776 | } else { |
777 | 777 | // tickets can not be purchased but let's find the exact number left for the last ticket selected PRIOR to subtracting tickets |
778 | - $available_spaces = self::_ticket_datetime_availability( $ticket, true ); |
|
778 | + $available_spaces = self::_ticket_datetime_availability($ticket, true); |
|
779 | 779 | // greedy greedy greedy eh? |
780 | - if ( $available_spaces > 0 ) { |
|
780 | + if ($available_spaces > 0) { |
|
781 | 781 | // add error messaging - we're using the _n function that will generate the appropriate singular or plural message based on the number of $available_spaces |
782 | 782 | EE_Error::add_error( |
783 | 783 | sprintf( |
@@ -793,7 +793,7 @@ discard block |
||
793 | 793 | __FILE__, __FUNCTION__, __LINE__ |
794 | 794 | ); |
795 | 795 | } else { |
796 | - EE_Error::add_error( __('We\'re sorry, but there are no available spaces left for this event at this particular date and time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
796 | + EE_Error::add_error(__('We\'re sorry, but there are no available spaces left for this event at this particular date and time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
797 | 797 | } |
798 | 798 | return false; |
799 | 799 | } |
@@ -811,22 +811,22 @@ discard block |
||
811 | 811 | * @param bool $get_original_ticket_spaces |
812 | 812 | * @return int |
813 | 813 | */ |
814 | - private static function _ticket_datetime_availability( EE_Ticket $ticket, $get_original_ticket_spaces = FALSE ) { |
|
814 | + private static function _ticket_datetime_availability(EE_Ticket $ticket, $get_original_ticket_spaces = FALSE) { |
|
815 | 815 | // if the $_available_spaces array has not been set up yet... |
816 | - if ( ! isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) { |
|
817 | - self::_set_initial_ticket_datetime_availability( $ticket ); |
|
816 | + if ( ! isset(self::$_available_spaces['tickets'][$ticket->ID()])) { |
|
817 | + self::_set_initial_ticket_datetime_availability($ticket); |
|
818 | 818 | } |
819 | 819 | $available_spaces = $ticket->qty() - $ticket->sold(); |
820 | - if ( isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) { |
|
820 | + if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) { |
|
821 | 821 | // loop thru tickets, which will ALSO include individual ticket records AND a total |
822 | - foreach ( self::$_available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces ) { |
|
822 | + foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) { |
|
823 | 823 | // if we want the original datetime availability BEFORE we started subtracting tickets ? |
824 | - if ( $get_original_ticket_spaces ) { |
|
824 | + if ($get_original_ticket_spaces) { |
|
825 | 825 | // then grab the available spaces from the "tickets" array and compare with the above to get the lowest number |
826 | - $available_spaces = min( $available_spaces, self::$_available_spaces['tickets'][ $ticket->ID() ][ $DTD_ID ] ); |
|
826 | + $available_spaces = min($available_spaces, self::$_available_spaces['tickets'][$ticket->ID()][$DTD_ID]); |
|
827 | 827 | } else { |
828 | 828 | // we want the updated ticket availability as stored in the "datetimes" array |
829 | - $available_spaces = min( $available_spaces, self::$_available_spaces['datetimes'][ $DTD_ID ] ); |
|
829 | + $available_spaces = min($available_spaces, self::$_available_spaces['datetimes'][$DTD_ID]); |
|
830 | 830 | } |
831 | 831 | } |
832 | 832 | } |
@@ -842,23 +842,23 @@ discard block |
||
842 | 842 | * @param EE_Ticket $ticket |
843 | 843 | * @return int |
844 | 844 | */ |
845 | - private static function _set_initial_ticket_datetime_availability( EE_Ticket $ticket ) { |
|
845 | + private static function _set_initial_ticket_datetime_availability(EE_Ticket $ticket) { |
|
846 | 846 | // first, get all of the datetimes that are available to this ticket |
847 | 847 | $datetimes = $ticket->get_many_related( |
848 | 848 | 'Datetime', |
849 | - array( array( 'DTT_EVT_end' => array( '>=', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ) ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' )) |
|
849 | + array(array('DTT_EVT_end' => array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'))), 'order_by' => array('DTT_EVT_start' => 'ASC')) |
|
850 | 850 | ); |
851 | - if ( ! empty( $datetimes )) { |
|
851 | + if ( ! empty($datetimes)) { |
|
852 | 852 | // now loop thru all of the datetimes |
853 | - foreach ( $datetimes as $datetime ) { |
|
854 | - if ( $datetime instanceof EE_Datetime ) { |
|
853 | + foreach ($datetimes as $datetime) { |
|
854 | + if ($datetime instanceof EE_Datetime) { |
|
855 | 855 | // the number of spaces available for the datetime without considering individual ticket quantities |
856 | 856 | $spaces_remaining = $datetime->spaces_remaining(); |
857 | 857 | // save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold or the datetime spaces remaining) to this ticket using the datetime ID as the key |
858 | - self::$_available_spaces['tickets'][ $ticket->ID() ][ $datetime->ID() ] = min(( $ticket->qty() - $ticket->sold() ), $spaces_remaining ); |
|
858 | + self::$_available_spaces['tickets'][$ticket->ID()][$datetime->ID()] = min(($ticket->qty() - $ticket->sold()), $spaces_remaining); |
|
859 | 859 | // if the remaining spaces for this datetime is already set, then compare that against the datetime spaces remaining, and take the lowest number, |
860 | 860 | // else just take the datetime spaces remaining, and assign to the datetimes array |
861 | - self::$_available_spaces['datetimes'][ $datetime->ID() ] = isset( self::$_available_spaces['datetimes'][ $datetime->ID() ] ) ? min( self::$_available_spaces['datetimes'][ $datetime->ID() ], $spaces_remaining ) : $spaces_remaining; |
|
861 | + self::$_available_spaces['datetimes'][$datetime->ID()] = isset(self::$_available_spaces['datetimes'][$datetime->ID()]) ? min(self::$_available_spaces['datetimes'][$datetime->ID()], $spaces_remaining) : $spaces_remaining; |
|
862 | 862 | } |
863 | 863 | } |
864 | 864 | } |
@@ -874,12 +874,12 @@ discard block |
||
874 | 874 | * @param int $qty |
875 | 875 | * @return int |
876 | 876 | */ |
877 | - private static function _recalculate_ticket_datetime_availability( EE_Ticket $ticket, $qty = 0 ) { |
|
878 | - if ( isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) { |
|
877 | + private static function _recalculate_ticket_datetime_availability(EE_Ticket $ticket, $qty = 0) { |
|
878 | + if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) { |
|
879 | 879 | // loop thru tickets, which will ALSO include individual ticket records AND a total |
880 | - foreach ( self::$_available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces ) { |
|
880 | + foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) { |
|
881 | 881 | // subtract the qty of selected tickets from each datetime's available spaces this ticket has access to, |
882 | - self::$_available_spaces['datetimes'][ $DTD_ID ] = self::$_available_spaces['datetimes'][ $DTD_ID ] - $qty; |
|
882 | + self::$_available_spaces['datetimes'][$DTD_ID] = self::$_available_spaces['datetimes'][$DTD_ID] - $qty; |
|
883 | 883 | } |
884 | 884 | } |
885 | 885 | } |
@@ -896,8 +896,8 @@ discard block |
||
896 | 896 | */ |
897 | 897 | public static function load_tckt_slctr_assets() { |
898 | 898 | // add some style |
899 | - if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) { |
|
900 | - wp_register_style('ticket_selector', TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css'); |
|
899 | + if (apply_filters('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE)) { |
|
900 | + wp_register_style('ticket_selector', TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css'); |
|
901 | 901 | wp_enqueue_style('ticket_selector'); |
902 | 902 | // make it dance |
903 | 903 | // wp_register_script('ticket_selector', TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js', array('espresso_core'), '', TRUE); |
@@ -911,9 +911,9 @@ discard block |
||
911 | 911 | |
912 | 912 | public static function load_tckt_slctr_assets_admin() { |
913 | 913 | //iframe button js on admin event editor page |
914 | - if ( EE_Registry::instance()->REQ->get('page') == 'espresso_events' && EE_Registry::instance()->REQ->get('action') == 'edit' ) { |
|
915 | - wp_register_script( 'ticket_selector_embed', TICKET_SELECTOR_ASSETS_URL . 'ticket-selector-embed.js', array( 'ee-dialog' ), EVENT_ESPRESSO_VERSION, true ); |
|
916 | - wp_enqueue_script( 'ticket_selector_embed' ); |
|
914 | + if (EE_Registry::instance()->REQ->get('page') == 'espresso_events' && EE_Registry::instance()->REQ->get('action') == 'edit') { |
|
915 | + wp_register_script('ticket_selector_embed', TICKET_SELECTOR_ASSETS_URL.'ticket-selector-embed.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, true); |
|
916 | + wp_enqueue_script('ticket_selector_embed'); |
|
917 | 917 | } |
918 | 918 | } |
919 | 919 |
@@ -503,7 +503,7 @@ |
||
503 | 503 | /** |
504 | 504 | * @param $message_types |
505 | 505 | * @param array $extra |
506 | - * @return mixed|string |
|
506 | + * @return string |
|
507 | 507 | */ |
508 | 508 | protected function _get_admin_content_events_edit( $message_types, $extra ) { |
509 | 509 | //defaults |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @param EE_Admin_Page $admin_page |
45 | 45 | */ |
46 | - public function __construct( $admin_page ) { |
|
46 | + public function __construct($admin_page) { |
|
47 | 47 | parent::__construct($admin_page); |
48 | - require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' ); |
|
48 | + require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | protected function _setup_data() { |
56 | 56 | $this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page); |
57 | - $this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE); |
|
57 | + $this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -85,17 +85,17 @@ discard block |
||
85 | 85 | |
86 | 86 | |
87 | 87 | $this->_sortable_columns = array( |
88 | - 'id' => array( 'EVT_ID' => true ), |
|
89 | - 'name' => array( 'EVT_name' => false ), |
|
90 | - 'author' => array( 'EVT_wp_user' => false ), |
|
91 | - 'venue' => array( 'Venue.VNU_name' => false ), |
|
88 | + 'id' => array('EVT_ID' => true), |
|
89 | + 'name' => array('EVT_name' => false), |
|
90 | + 'author' => array('EVT_wp_user' => false), |
|
91 | + 'venue' => array('Venue.VNU_name' => false), |
|
92 | 92 | 'start_date_time' => array('Datetime.DTT_EVT_start' => false), |
93 | 93 | 'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false), |
94 | 94 | ); |
95 | 95 | |
96 | 96 | $this->_primary_column = 'id'; |
97 | 97 | |
98 | - $this->_hidden_columns = array( 'author' ); |
|
98 | + $this->_hidden_columns = array('author'); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | protected function _add_view_counts() { |
114 | 114 | $this->_views['all']['count'] = $this->_admin_page->total_events(); |
115 | 115 | $this->_views['draft']['count'] = $this->_admin_page->total_events_draft(); |
116 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) { |
|
116 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) { |
|
117 | 117 | $this->_views['trash']['count'] = $this->_admin_page->total_trashed_events(); |
118 | 118 | } |
119 | 119 | } |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @return string |
126 | 126 | */ |
127 | - protected function _get_row_class( $item ) { |
|
128 | - $class = parent::_get_row_class( $item ); |
|
127 | + protected function _get_row_class($item) { |
|
128 | + $class = parent::_get_row_class($item); |
|
129 | 129 | //add status class |
130 | - $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : ''; |
|
131 | - if ( $this->_has_checkbox_column ) { |
|
130 | + $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : ''; |
|
131 | + if ($this->_has_checkbox_column) { |
|
132 | 132 | $class .= ' has-checkbox-column'; |
133 | 133 | } |
134 | 134 | return $class; |
@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | * |
141 | 141 | * @return string |
142 | 142 | */ |
143 | - public function column_status( EE_Event $item ) { |
|
144 | - return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>'; |
|
143 | + public function column_status(EE_Event $item) { |
|
144 | + return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>'; |
|
145 | 145 | }/**/ |
146 | 146 | |
147 | 147 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @return string |
152 | 152 | */ |
153 | - public function column_cb( $item ) { |
|
153 | + public function column_cb($item) { |
|
154 | 154 | $this->_dtt = $item->primary_datetime(); //set this for use in other columns |
155 | 155 | |
156 | 156 | //does event have any attached registrations? |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | * |
167 | 167 | * @return mixed|string |
168 | 168 | */ |
169 | - public function column_id( EE_Event $item ) { |
|
169 | + public function column_id(EE_Event $item) { |
|
170 | 170 | $content = $item->ID(); |
171 | - $content .= ' <span class="show-on-mobile-view-only">' . $item->name() . '</span>'; |
|
171 | + $content .= ' <span class="show-on-mobile-view-only">'.$item->name().'</span>'; |
|
172 | 172 | return $content; |
173 | 173 | } |
174 | 174 | |
@@ -178,16 +178,16 @@ discard block |
||
178 | 178 | * |
179 | 179 | * @return string |
180 | 180 | */ |
181 | - public function column_name( EE_Event $item ) { |
|
181 | + public function column_name(EE_Event $item) { |
|
182 | 182 | $edit_query_args = array( |
183 | 183 | 'action' => 'edit', |
184 | 184 | 'post' => $item->ID() |
185 | 185 | ); |
186 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
187 | - $actions = $this->_column_name_action_setup( $item ); |
|
186 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
187 | + $actions = $this->_column_name_action_setup($item); |
|
188 | 188 | $status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : ''; |
189 | - $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status; |
|
190 | - $content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>'; |
|
189 | + $content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status; |
|
190 | + $content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>'; |
|
191 | 191 | $content .= $this->row_actions($actions); |
192 | 192 | return $content; |
193 | 193 | |
@@ -204,72 +204,72 @@ discard block |
||
204 | 204 | * |
205 | 205 | * @return array array of actions |
206 | 206 | */ |
207 | - protected function _column_name_action_setup( EE_Event $item ) { |
|
207 | + protected function _column_name_action_setup(EE_Event $item) { |
|
208 | 208 | //todo: remove when attendees is active |
209 | - if ( !defined('REG_ADMIN_URL') ) |
|
209 | + if ( ! defined('REG_ADMIN_URL')) |
|
210 | 210 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
211 | 211 | |
212 | 212 | $actions = array(); |
213 | 213 | |
214 | - if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
214 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
215 | 215 | $edit_query_args = array( |
216 | 216 | 'action' => 'edit', |
217 | 217 | 'post' => $item->ID() |
218 | 218 | ); |
219 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
220 | - $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'; |
|
219 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
220 | + $actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'; |
|
221 | 221 | |
222 | 222 | } |
223 | 223 | |
224 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
224 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
225 | 225 | $attendees_query_args = array( |
226 | 226 | 'action' => 'default', |
227 | 227 | 'event_id' => $item->ID() |
228 | 228 | ); |
229 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
230 | - $actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>'; |
|
229 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
230 | + $actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>'; |
|
231 | 231 | } |
232 | 232 | |
233 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
233 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
234 | 234 | $trash_event_query_args = array( |
235 | 235 | 'action' => 'trash_event', |
236 | 236 | 'EVT_ID' => $item->ID() |
237 | 237 | ); |
238 | - $trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL ); |
|
238 | + $trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL); |
|
239 | 239 | } |
240 | 240 | |
241 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
241 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
242 | 242 | $restore_event_query_args = array( |
243 | 243 | 'action' => 'restore_event', |
244 | 244 | 'EVT_ID' => $item->ID() |
245 | 245 | ); |
246 | - $restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL ); |
|
246 | + $restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL); |
|
247 | 247 | } |
248 | 248 | |
249 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
249 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
250 | 250 | $delete_event_query_args = array( |
251 | 251 | 'action' => 'delete_event', |
252 | 252 | 'EVT_ID' => $item->ID() |
253 | 253 | ); |
254 | - $delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL ); |
|
254 | + $delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | $view_link = get_permalink($item->ID()); |
258 | 258 | |
259 | - $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>'; |
|
259 | + $actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>'; |
|
260 | 260 | |
261 | - switch ( $item->get( 'status' ) ) { |
|
261 | + switch ($item->get('status')) { |
|
262 | 262 | case 'trash' : |
263 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
264 | - $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>'; |
|
263 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
264 | + $actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>'; |
|
265 | 265 | } |
266 | - if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
267 | - $actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>'; |
|
266 | + if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
267 | + $actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>'; |
|
268 | 268 | } |
269 | 269 | break; |
270 | 270 | default : |
271 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
272 | - $actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>'; |
|
271 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
272 | + $actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>'; |
|
273 | 273 | } |
274 | 274 | } |
275 | 275 | return $actions; |
@@ -281,17 +281,17 @@ discard block |
||
281 | 281 | * |
282 | 282 | * @return string |
283 | 283 | */ |
284 | - public function column_author( EE_Event $item ) { |
|
284 | + public function column_author(EE_Event $item) { |
|
285 | 285 | //user author info |
286 | - $event_author = get_userdata( $item->wp_user() ); |
|
287 | - $gravatar = get_avatar( $item->wp_user(), '15' ); |
|
286 | + $event_author = get_userdata($item->wp_user()); |
|
287 | + $gravatar = get_avatar($item->wp_user(), '15'); |
|
288 | 288 | //filter link |
289 | 289 | $query_args = array( |
290 | 290 | 'action' => 'default', |
291 | 291 | 'EVT_wp_user' => $item->wp_user() |
292 | 292 | ); |
293 | - $filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL ); |
|
294 | - return $gravatar . ' <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>'; |
|
293 | + $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL); |
|
294 | + return $gravatar.' <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>'; |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | |
@@ -300,9 +300,9 @@ discard block |
||
300 | 300 | * |
301 | 301 | * @return string |
302 | 302 | */ |
303 | - public function column_venue( EE_Event $item ) { |
|
304 | - $venue = $item->get_first_related( 'Venue' ); |
|
305 | - return !empty( $venue ) ? $venue->name() : ''; |
|
303 | + public function column_venue(EE_Event $item) { |
|
304 | + $venue = $item->get_first_related('Venue'); |
|
305 | + return ! empty($venue) ? $venue->name() : ''; |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | |
@@ -311,10 +311,10 @@ discard block |
||
311 | 311 | * |
312 | 312 | * @throws EE_Error |
313 | 313 | */ |
314 | - public function column_start_date_time( EE_Event $item ) { |
|
315 | - echo !empty( $this->_dtt ) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
314 | + public function column_start_date_time(EE_Event $item) { |
|
315 | + echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
316 | 316 | //display in user's timezone? |
317 | - echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : ''; |
|
317 | + echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : ''; |
|
318 | 318 | |
319 | 319 | } |
320 | 320 | |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | * |
325 | 325 | * @throws EE_Error |
326 | 326 | */ |
327 | - public function column_reg_begins( EE_Event $item ) { |
|
327 | + public function column_reg_begins(EE_Event $item) { |
|
328 | 328 | $reg_start = $item->get_ticket_with_earliest_start_time(); |
329 | - echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
329 | + echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
330 | 330 | //display in user's timezone? |
331 | - echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/ |
|
331 | + echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/ |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | |
@@ -337,14 +337,14 @@ discard block |
||
337 | 337 | * |
338 | 338 | * @return int|string |
339 | 339 | */ |
340 | - public function column_attendees( EE_Event $item ) { |
|
340 | + public function column_attendees(EE_Event $item) { |
|
341 | 341 | $attendees_query_args = array( |
342 | 342 | 'action' => 'default', |
343 | 343 | 'event_id' => $item->ID() |
344 | 344 | ); |
345 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
346 | - $registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() ); |
|
347 | - return EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees; |
|
345 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
346 | + $registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID()); |
|
347 | + return EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees; |
|
348 | 348 | } |
349 | 349 | |
350 | 350 | |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | * |
354 | 354 | * @return float |
355 | 355 | */ |
356 | - public function column_tkts_sold( EE_Event $item ) { |
|
357 | - return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' ); |
|
356 | + public function column_tkts_sold(EE_Event $item) { |
|
357 | + return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold'); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | |
@@ -363,38 +363,38 @@ discard block |
||
363 | 363 | * |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function column_actions( EE_Event $item ) { |
|
366 | + public function column_actions(EE_Event $item) { |
|
367 | 367 | //todo: remove when attendees is active |
368 | - if ( !defined('REG_ADMIN_URL') ) |
|
368 | + if ( ! defined('REG_ADMIN_URL')) |
|
369 | 369 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
370 | 370 | $actionlinks = array(); |
371 | 371 | |
372 | 372 | $view_link = get_permalink($item->ID()); |
373 | 373 | |
374 | - $actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">'; |
|
374 | + $actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">'; |
|
375 | 375 | $actionlinks[] = '<div class="dashicons dashicons-search"></div></a>'; |
376 | 376 | |
377 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
377 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
378 | 378 | $edit_query_args = array( |
379 | 379 | 'action' => 'edit', |
380 | 380 | 'post' => $item->ID() |
381 | 381 | ); |
382 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
383 | - $actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
382 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
383 | + $actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
384 | 384 | } |
385 | 385 | |
386 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
386 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
387 | 387 | $attendees_query_args = array( |
388 | 388 | 'action' => 'default', |
389 | 389 | 'event_id' => $item->ID() |
390 | 390 | ); |
391 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
392 | - $actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>'; |
|
391 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
392 | + $actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>'; |
|
393 | 393 | } |
394 | 394 | |
395 | - $actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item ); |
|
395 | + $actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item); |
|
396 | 396 | |
397 | - return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' ); |
|
397 | + return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div'); |
|
398 | 398 | } |
399 | 399 | |
400 | 400 |
@@ -1455,7 +1455,7 @@ discard block |
||
1455 | 1455 | * @param EE_Transaction $transaction |
1456 | 1456 | * @param \EE_Payment $payment |
1457 | 1457 | * @param array $REG_IDs |
1458 | - * @return bool |
|
1458 | + * @return boolean|null |
|
1459 | 1459 | */ |
1460 | 1460 | protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
1461 | 1461 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
@@ -1647,6 +1647,7 @@ discard block |
||
1647 | 1647 | * |
1648 | 1648 | * @access protected |
1649 | 1649 | * @param \EE_Payment | null $payment |
1650 | + * @param EE_Payment $payment |
|
1650 | 1651 | */ |
1651 | 1652 | protected function _maybe_send_notifications( $payment = null ) { |
1652 | 1653 | switch ( $payment instanceof EE_Payment ) { |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param bool $routing |
57 | 57 | * @return Transactions_Admin_Page |
58 | 58 | */ |
59 | - public function __construct( $routing = TRUE ) { |
|
60 | - parent::__construct( $routing ); |
|
59 | + public function __construct($routing = TRUE) { |
|
60 | + parent::__construct($routing); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return void |
81 | 81 | */ |
82 | 82 | protected function _ajax_hooks() { |
83 | - add_action('wp_ajax_espresso_apply_payment', array( $this, 'apply_payments_or_refunds')); |
|
84 | - add_action('wp_ajax_espresso_apply_refund', array( $this, 'apply_payments_or_refunds')); |
|
85 | - add_action('wp_ajax_espresso_delete_payment', array( $this, 'delete_payment')); |
|
83 | + add_action('wp_ajax_espresso_apply_payment', array($this, 'apply_payments_or_refunds')); |
|
84 | + add_action('wp_ajax_espresso_apply_refund', array($this, 'apply_payments_or_refunds')); |
|
85 | + add_action('wp_ajax_espresso_delete_payment', array($this, 'delete_payment')); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | 'buttons' => array( |
98 | 98 | 'add' => __('Add New Transaction', 'event_espresso'), |
99 | 99 | 'edit' => __('Edit Transaction', 'event_espresso'), |
100 | - 'delete' => __('Delete Transaction','event_espresso') |
|
100 | + 'delete' => __('Delete Transaction', 'event_espresso') |
|
101 | 101 | ) |
102 | 102 | ); |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $this->_set_transaction_status_array(); |
115 | 115 | |
116 | - $txn_id = ! empty( $this->_req_data['TXN_ID'] ) && ! is_array( $this->_req_data['TXN_ID'] ) ? $this->_req_data['TXN_ID'] : 0; |
|
116 | + $txn_id = ! empty($this->_req_data['TXN_ID']) && ! is_array($this->_req_data['TXN_ID']) ? $this->_req_data['TXN_ID'] : 0; |
|
117 | 117 | |
118 | 118 | $this->_page_routes = array( |
119 | 119 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | 'filename' => 'transactions_overview_views_filters_search' |
186 | 186 | ), |
187 | 187 | ), |
188 | - 'help_tour' => array( 'Transactions_Overview_Help_Tour' ), |
|
188 | + 'help_tour' => array('Transactions_Overview_Help_Tour'), |
|
189 | 189 | /** |
190 | 190 | * commented out because currently we are not displaying tips for transaction list table status but this |
191 | 191 | * may change in a later iteration so want to keep the code for then. |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | 'nav' => array( |
198 | 198 | 'label' => __('View Transaction', 'event_espresso'), |
199 | 199 | 'order' => 5, |
200 | - 'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
|
200 | + 'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID']), $this->_current_page_view_url) : $this->_admin_base_url, |
|
201 | 201 | 'persistent' => FALSE |
202 | 202 | ), |
203 | 203 | 'help_tabs' => array( |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | 'filename' => 'transactions_view_transaction_primary_registrant_billing_information' |
219 | 219 | ), |
220 | 220 | ), |
221 | - 'qtips' => array( 'Transaction_Details_Tips' ), |
|
222 | - 'help_tour' => array( 'Transaction_Details_Help_Tour' ), |
|
221 | + 'qtips' => array('Transaction_Details_Tips'), |
|
222 | + 'help_tour' => array('Transaction_Details_Help_Tour'), |
|
223 | 223 | 'metaboxes' => array('_transaction_details_metaboxes'), |
224 | 224 | |
225 | 225 | 'require_nonce' => FALSE |
@@ -234,10 +234,10 @@ discard block |
||
234 | 234 | protected function _add_screen_options() {} |
235 | 235 | protected function _add_feature_pointers() {} |
236 | 236 | public function admin_init() { |
237 | - EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = __( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' ); |
|
238 | - EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' ); |
|
239 | - EE_Registry::$i18n_js_strings[ 'txn_status_array' ] = self::$_txn_status; |
|
240 | - EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status; |
|
237 | + EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso'); |
|
238 | + EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso'); |
|
239 | + EE_Registry::$i18n_js_strings['txn_status_array'] = self::$_txn_status; |
|
240 | + EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status; |
|
241 | 241 | } |
242 | 242 | public function admin_notices() {} |
243 | 243 | public function admin_footer_scripts() {} |
@@ -304,14 +304,14 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function load_scripts_styles() { |
306 | 306 | //enqueue style |
307 | - wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION ); |
|
307 | + wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION); |
|
308 | 308 | wp_enqueue_style('espresso_txn'); |
309 | 309 | |
310 | 310 | //scripts |
311 | 311 | add_filter('FHEE_load_accounting_js', '__return_true'); |
312 | 312 | |
313 | 313 | //scripts |
314 | - wp_register_script('espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE); |
|
314 | + wp_register_script('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE); |
|
315 | 315 | wp_enqueue_script('espresso_txn'); |
316 | 316 | |
317 | 317 | } |
@@ -351,8 +351,8 @@ discard block |
||
351 | 351 | * @return void |
352 | 352 | */ |
353 | 353 | protected function _set_list_table_views_default() { |
354 | - $this->_views = array ( |
|
355 | - 'all' => array ( |
|
354 | + $this->_views = array( |
|
355 | + 'all' => array( |
|
356 | 356 | 'slug' => 'all', |
357 | 357 | 'label' => __('View All Transactions', 'event_espresso'), |
358 | 358 | 'count' => 0 |
@@ -380,20 +380,20 @@ discard block |
||
380 | 380 | * @return void |
381 | 381 | */ |
382 | 382 | private function _set_transaction_object() { |
383 | - if ( is_object( $this->_transaction) ) |
|
383 | + if (is_object($this->_transaction)) |
|
384 | 384 | return; //get out we've already set the object |
385 | 385 | |
386 | 386 | $TXN = EEM_Transaction::instance(); |
387 | 387 | |
388 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
388 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
389 | 389 | |
390 | 390 | //get transaction object |
391 | 391 | $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
392 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
392 | + $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
393 | 393 | |
394 | - if ( empty( $this->_transaction ) ) { |
|
395 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
396 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
394 | + if (empty($this->_transaction)) { |
|
395 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.__(' could not be retrieved.', 'event_espresso'); |
|
396 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
397 | 397 | } |
398 | 398 | } |
399 | 399 | |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | ), |
420 | 420 | 'view_receipt' => array( |
421 | 421 | 'class' => 'dashicons dashicons-media-default', |
422 | - 'desc' => __('View Transaction Receipt', 'event_espresso' ) |
|
422 | + 'desc' => __('View Transaction Receipt', 'event_espresso') |
|
423 | 423 | ), |
424 | 424 | 'view_registration' => array( |
425 | 425 | 'class' => 'dashicons dashicons-clipboard', |
@@ -428,10 +428,10 @@ discard block |
||
428 | 428 | ) |
429 | 429 | ); |
430 | 430 | |
431 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) { |
|
431 | + if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) { |
|
432 | 432 | |
433 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
434 | - if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) { |
|
433 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
434 | + if (EEH_MSG_Template::is_mt_active('payment_reminder')) { |
|
435 | 435 | $items['send_payment_reminder'] = array( |
436 | 436 | 'class' => 'dashicons dashicons-email-alt', |
437 | 437 | 'desc' => __('Send Payment Reminder', 'event_espresso') |
@@ -452,29 +452,29 @@ discard block |
||
452 | 452 | 'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items', |
453 | 453 | array( |
454 | 454 | 'overpaid' => array( |
455 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code, |
|
456 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' ) |
|
455 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code, |
|
456 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence') |
|
457 | 457 | ), |
458 | 458 | 'complete' => array( |
459 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code, |
|
460 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' ) |
|
459 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code, |
|
460 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence') |
|
461 | 461 | ), |
462 | 462 | 'incomplete' => array( |
463 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code, |
|
464 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' ) |
|
463 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code, |
|
464 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence') |
|
465 | 465 | ), |
466 | 466 | 'abandoned' => array( |
467 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code, |
|
468 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' ) |
|
467 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code, |
|
468 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence') |
|
469 | 469 | ), |
470 | 470 | 'failed' => array( |
471 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code, |
|
472 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' ) |
|
471 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code, |
|
472 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence') |
|
473 | 473 | ) |
474 | 474 | ) |
475 | 475 | ); |
476 | 476 | |
477 | - return array_merge( $items, $more_items); |
|
477 | + return array_merge($items, $more_items); |
|
478 | 478 | } |
479 | 479 | |
480 | 480 | |
@@ -487,9 +487,9 @@ discard block |
||
487 | 487 | */ |
488 | 488 | protected function _transactions_overview_list_table() { |
489 | 489 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
490 | - $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL; |
|
491 | - $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL ) . '" title="' . esc_attr__('Click to Edit event', 'event_espresso') . '">' . $event->get('EVT_name') . '</a>', '</h3>' ) : ''; |
|
492 | - $this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() ); |
|
490 | + $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL; |
|
491 | + $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'" title="'.esc_attr__('Click to Edit event', 'event_espresso').'">'.$event->get('EVT_name').'</a>', '</h3>') : ''; |
|
492 | + $this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items()); |
|
493 | 493 | $this->display_admin_list_table_page_with_no_sidebar(); |
494 | 494 | } |
495 | 495 | |
@@ -503,8 +503,8 @@ discard block |
||
503 | 503 | * @return void |
504 | 504 | */ |
505 | 505 | protected function _transaction_details() { |
506 | - do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
|
507 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
506 | + do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction); |
|
507 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
508 | 508 | |
509 | 509 | $this->_set_transaction_status_array(); |
510 | 510 | |
@@ -517,75 +517,75 @@ discard block |
||
517 | 517 | $attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL; |
518 | 518 | |
519 | 519 | $this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID(); |
520 | - $this->_template_args['txn_nmbr']['label'] = __( 'Transaction Number', 'event_espresso' ); |
|
520 | + $this->_template_args['txn_nmbr']['label'] = __('Transaction Number', 'event_espresso'); |
|
521 | 521 | |
522 | - $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a' ); |
|
523 | - $this->_template_args['txn_datetime']['label'] = __( 'Date', 'event_espresso' ); |
|
522 | + $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a'); |
|
523 | + $this->_template_args['txn_datetime']['label'] = __('Date', 'event_espresso'); |
|
524 | 524 | |
525 | - $this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ]; |
|
526 | - $this->_template_args['txn_status']['label'] = __( 'Transaction Status', 'event_espresso' ); |
|
527 | - $this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID'); |
|
525 | + $this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')]; |
|
526 | + $this->_template_args['txn_status']['label'] = __('Transaction Status', 'event_espresso'); |
|
527 | + $this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID'); |
|
528 | 528 | |
529 | 529 | $this->_template_args['grand_total'] = $this->_transaction->get('TXN_total'); |
530 | 530 | $this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid'); |
531 | 531 | |
532 | - if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) { |
|
533 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
534 | - $this->_template_args['send_payment_reminder_button'] = EEH_MSG_Template::is_mt_active( 'payment_reminder' ) |
|
532 | + if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) { |
|
533 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
534 | + $this->_template_args['send_payment_reminder_button'] = EEH_MSG_Template::is_mt_active('payment_reminder') |
|
535 | 535 | && $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code |
536 | 536 | && $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code |
537 | - ? EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$this->_transaction->ID(), 'redirect_to' => 'view_transaction' ), TXN_ADMIN_URL ), __(' Send Payment Reminder'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) |
|
537 | + ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$this->_transaction->ID(), 'redirect_to' => 'view_transaction'), TXN_ADMIN_URL), __(' Send Payment Reminder'), 'button secondary-button right', 'dashicons dashicons-email-alt') |
|
538 | 538 | : ''; |
539 | 539 | } else { |
540 | 540 | $this->_template_args['send_payment_reminder_button'] = ''; |
541 | 541 | } |
542 | 542 | |
543 | 543 | $amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid'); |
544 | - $this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE ); |
|
545 | - if ( EE_Registry::instance()->CFG->currency->sign_b4 ) { |
|
546 | - $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due']; |
|
544 | + $this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE); |
|
545 | + if (EE_Registry::instance()->CFG->currency->sign_b4) { |
|
546 | + $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due']; |
|
547 | 547 | } else { |
548 | - $this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign; |
|
548 | + $this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign; |
|
549 | 549 | } |
550 | - $this->_template_args['amount_due_class'] = ''; |
|
550 | + $this->_template_args['amount_due_class'] = ''; |
|
551 | 551 | |
552 | - if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) { |
|
552 | + if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) { |
|
553 | 553 | // paid in full |
554 | - $this->_template_args['amount_due'] = FALSE; |
|
555 | - } elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) { |
|
554 | + $this->_template_args['amount_due'] = FALSE; |
|
555 | + } elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) { |
|
556 | 556 | // overpaid |
557 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
558 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) { |
|
557 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
558 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) { |
|
559 | 559 | // monies owing |
560 | - $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
561 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) { |
|
560 | + $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
561 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) { |
|
562 | 562 | // no payments made yet |
563 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
564 | - } elseif ( $this->_transaction->get('TXN_total') == 0 ) { |
|
563 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
564 | + } elseif ($this->_transaction->get('TXN_total') == 0) { |
|
565 | 565 | // free event |
566 | - $this->_template_args['amount_due'] = FALSE; |
|
566 | + $this->_template_args['amount_due'] = FALSE; |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | $payment_method = $this->_transaction->payment_method(); |
570 | 570 | |
571 | - $this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' ); |
|
571 | + $this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso'); |
|
572 | 572 | $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign; |
573 | 573 | // link back to overview |
574 | - $this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : TXN_ADMIN_URL; |
|
574 | + $this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : TXN_ADMIN_URL; |
|
575 | 575 | |
576 | 576 | |
577 | 577 | //next and previous links |
578 | - $next_txn = $this->_transaction->next(null, array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), 'TXN_ID' ); |
|
579 | - $this->_template_args['next_transaction'] = $next_txn ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ), TXN_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : ''; |
|
580 | - $previous_txn = $this->_transaction->previous( null, array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), 'TXN_ID' ); |
|
581 | - $this->_template_args['previous_transaction'] = $previous_txn ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ), TXN_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : ''; |
|
578 | + $next_txn = $this->_transaction->next(null, array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), 'TXN_ID'); |
|
579 | + $this->_template_args['next_transaction'] = $next_txn ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']), TXN_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : ''; |
|
580 | + $previous_txn = $this->_transaction->previous(null, array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), 'TXN_ID'); |
|
581 | + $this->_template_args['previous_transaction'] = $previous_txn ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']), TXN_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : ''; |
|
582 | 582 | |
583 | 583 | |
584 | 584 | // grab messages at the last second |
585 | 585 | $this->_template_args['notices'] = EE_Error::get_notices(); |
586 | 586 | // path to template |
587 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php'; |
|
588 | - $this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
587 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php'; |
|
588 | + $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
589 | 589 | |
590 | 590 | // the details template wrapper |
591 | 591 | $this->display_admin_page_with_sidebar(); |
@@ -604,18 +604,18 @@ discard block |
||
604 | 604 | |
605 | 605 | $this->_set_transaction_object(); |
606 | 606 | |
607 | - add_meta_box( 'edit-txn-details-mbox', __( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' ); |
|
607 | + add_meta_box('edit-txn-details-mbox', __('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high'); |
|
608 | 608 | add_meta_box( |
609 | 609 | 'edit-txn-attendees-mbox', |
610 | - __( 'Attendees Registered in this Transaction', 'event_espresso' ), |
|
611 | - array( $this, 'txn_attendees_meta_box' ), |
|
610 | + __('Attendees Registered in this Transaction', 'event_espresso'), |
|
611 | + array($this, 'txn_attendees_meta_box'), |
|
612 | 612 | $this->_wp_page_slug, |
613 | 613 | 'normal', |
614 | 614 | 'high', |
615 | - array( 'TXN_ID' => $this->_transaction->ID() ) |
|
615 | + array('TXN_ID' => $this->_transaction->ID()) |
|
616 | 616 | ); |
617 | - add_meta_box( 'edit-txn-registrant-mbox', __( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
618 | - add_meta_box( 'edit-txn-billing-info-mbox', __( 'Billing Information', 'event_espresso' ), array( $this, 'txn_billing_info_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
617 | + add_meta_box('edit-txn-registrant-mbox', __('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
618 | + add_meta_box('edit-txn-billing-info-mbox', __('Billing Information', 'event_espresso'), array($this, 'txn_billing_info_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
619 | 619 | |
620 | 620 | } |
621 | 621 | |
@@ -636,15 +636,15 @@ discard block |
||
636 | 636 | |
637 | 637 | //get line table |
638 | 638 | EEH_Autoloader::register_line_item_display_autoloaders(); |
639 | - $Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' ); |
|
640 | - $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() ); |
|
639 | + $Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy'); |
|
640 | + $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item()); |
|
641 | 641 | $this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code'); |
642 | 642 | |
643 | 643 | // process taxes |
644 | - $taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax ))); |
|
645 | - $this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE; |
|
644 | + $taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax))); |
|
645 | + $this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE; |
|
646 | 646 | |
647 | - $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE ); |
|
647 | + $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE); |
|
648 | 648 | $this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total'); |
649 | 649 | $this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID'); |
650 | 650 | |
@@ -652,63 +652,63 @@ discard block |
||
652 | 652 | |
653 | 653 | // process payment details |
654 | 654 | $payments = $this->_transaction->get_many_related('Payment'); |
655 | - if( ! empty( $payments ) ) { |
|
656 | - $this->_template_args[ 'payments' ] = $payments; |
|
657 | - $this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments ); |
|
655 | + if ( ! empty($payments)) { |
|
656 | + $this->_template_args['payments'] = $payments; |
|
657 | + $this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments); |
|
658 | 658 | } else { |
659 | - $this->_template_args[ 'payments' ] = false; |
|
660 | - $this->_template_args[ 'existing_reg_payments' ] = array(); |
|
659 | + $this->_template_args['payments'] = false; |
|
660 | + $this->_template_args['existing_reg_payments'] = array(); |
|
661 | 661 | } |
662 | 662 | |
663 | - $this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment' ), TXN_ADMIN_URL ); |
|
664 | - $this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL ); |
|
663 | + $this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL); |
|
664 | + $this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL); |
|
665 | 665 | |
666 | - if ( isset( $txn_details['invoice_number'] )) { |
|
666 | + if (isset($txn_details['invoice_number'])) { |
|
667 | 667 | $this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code']; |
668 | - $this->_template_args['txn_details']['invoice_number']['label'] = __( 'Invoice Number', 'event_espresso' ); |
|
668 | + $this->_template_args['txn_details']['invoice_number']['label'] = __('Invoice Number', 'event_espresso'); |
|
669 | 669 | } |
670 | 670 | |
671 | 671 | $this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session'); |
672 | - $this->_template_args['txn_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' ); |
|
672 | + $this->_template_args['txn_details']['registration_session']['label'] = __('Registration Session', 'event_espresso'); |
|
673 | 673 | |
674 | - $this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : ''; |
|
675 | - $this->_template_args['txn_details']['ip_address']['label'] = __( 'Transaction placed from IP', 'event_espresso' ); |
|
674 | + $this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : ''; |
|
675 | + $this->_template_args['txn_details']['ip_address']['label'] = __('Transaction placed from IP', 'event_espresso'); |
|
676 | 676 | |
677 | - $this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : ''; |
|
678 | - $this->_template_args['txn_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' ); |
|
677 | + $this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : ''; |
|
678 | + $this->_template_args['txn_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso'); |
|
679 | 679 | |
680 | 680 | $reg_steps = '<ul>'; |
681 | - foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) { |
|
682 | - if ( $reg_step_status === true ) { |
|
683 | - $reg_steps .= '<li style="color:#70cc50">' . sprintf( __( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
684 | - } else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) { |
|
685 | - $reg_steps .= '<li style="color:#2EA2CC">' . sprintf( |
|
686 | - __( '%1$s : Initiated %2$s', 'event_espresso' ), |
|
687 | - ucwords( str_replace( '_', ' ', $reg_step ) ), |
|
688 | - gmdate( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) ) |
|
689 | - ) . '</li>'; |
|
681 | + foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) { |
|
682 | + if ($reg_step_status === true) { |
|
683 | + $reg_steps .= '<li style="color:#70cc50">'.sprintf(__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
684 | + } else if (is_numeric($reg_step_status) && $reg_step_status !== false) { |
|
685 | + $reg_steps .= '<li style="color:#2EA2CC">'.sprintf( |
|
686 | + __('%1$s : Initiated %2$s', 'event_espresso'), |
|
687 | + ucwords(str_replace('_', ' ', $reg_step)), |
|
688 | + gmdate(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS))) |
|
689 | + ).'</li>'; |
|
690 | 690 | } else { |
691 | - $reg_steps .= '<li style="color:#E76700">' . sprintf( __( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
691 | + $reg_steps .= '<li style="color:#E76700">'.sprintf(__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
692 | 692 | } |
693 | 693 | } |
694 | 694 | $reg_steps .= '</ul>'; |
695 | 695 | $this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps; |
696 | - $this->_template_args['txn_details']['reg_steps']['label'] = __( 'Registration Step Progress', 'event_espresso' ); |
|
696 | + $this->_template_args['txn_details']['reg_steps']['label'] = __('Registration Step Progress', 'event_espresso'); |
|
697 | 697 | |
698 | 698 | |
699 | 699 | $this->_get_registrations_to_apply_payment_to(); |
700 | - $this->_get_payment_methods( $payments ); |
|
700 | + $this->_get_payment_methods($payments); |
|
701 | 701 | $this->_get_payment_status_array(); |
702 | 702 | $this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction. |
703 | 703 | |
704 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction' ), TXN_ADMIN_URL ); |
|
705 | - $this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL ); |
|
706 | - $this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL ); |
|
704 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL); |
|
705 | + $this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL); |
|
706 | + $this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL); |
|
707 | 707 | |
708 | 708 | // 'espresso_delete_payment_nonce' |
709 | 709 | |
710 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
711 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
710 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
711 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
712 | 712 | |
713 | 713 | } |
714 | 714 | |
@@ -723,27 +723,27 @@ discard block |
||
723 | 723 | * @param EE_Payment[] $payments |
724 | 724 | * @return array |
725 | 725 | */ |
726 | - protected function _get_registration_payment_IDs( $payments = array() ) { |
|
726 | + protected function _get_registration_payment_IDs($payments = array()) { |
|
727 | 727 | $existing_reg_payments = array(); |
728 | 728 | // get all reg payments for these payments |
729 | - $reg_payments = EEM_Registration_Payment::instance()->get_all( array( |
|
729 | + $reg_payments = EEM_Registration_Payment::instance()->get_all(array( |
|
730 | 730 | array( |
731 | 731 | 'PAY_ID' => array( |
732 | 732 | 'IN', |
733 | - array_keys( $payments ) |
|
733 | + array_keys($payments) |
|
734 | 734 | ) |
735 | 735 | ) |
736 | - ) ); |
|
737 | - if ( ! empty( $reg_payments ) ) { |
|
738 | - foreach ( $payments as $payment ) { |
|
739 | - if ( ! $payment instanceof EE_Payment ) { |
|
736 | + )); |
|
737 | + if ( ! empty($reg_payments)) { |
|
738 | + foreach ($payments as $payment) { |
|
739 | + if ( ! $payment instanceof EE_Payment) { |
|
740 | 740 | continue; |
741 | - } else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) { |
|
742 | - $existing_reg_payments[ $payment->ID() ] = array(); |
|
741 | + } else if ( ! isset($existing_reg_payments[$payment->ID()])) { |
|
742 | + $existing_reg_payments[$payment->ID()] = array(); |
|
743 | 743 | } |
744 | - foreach ( $reg_payments as $reg_payment ) { |
|
745 | - if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) { |
|
746 | - $existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID(); |
|
744 | + foreach ($reg_payments as $reg_payment) { |
|
745 | + if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) { |
|
746 | + $existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID(); |
|
747 | 747 | } |
748 | 748 | } |
749 | 749 | } |
@@ -780,39 +780,39 @@ discard block |
||
780 | 780 | $registrations_to_apply_payment_to .= '<br /><div class="admin-primary-mbox-tbl-wrap">'; |
781 | 781 | $registrations_to_apply_payment_to .= '<table class="admin-primary-mbox-tbl">'; |
782 | 782 | $registrations_to_apply_payment_to .= '<thead><tr>'; |
783 | - $registrations_to_apply_payment_to .= '<td>' . __( 'ID', 'event_espresso' ) . '</td>'; |
|
784 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Registrant', 'event_espresso' ) . '</td>'; |
|
785 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Ticket', 'event_espresso' ) . '</td>'; |
|
786 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Event', 'event_espresso' ) . '</td>'; |
|
787 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">' . __( 'Paid', 'event_espresso' ) . '</td>'; |
|
788 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">' . __( 'Owing', 'event_espresso' ) . '</td>'; |
|
789 | - $registrations_to_apply_payment_to .= '<td class="jst-cntr">' . __( 'Apply', 'event_espresso' ) . '</td>'; |
|
783 | + $registrations_to_apply_payment_to .= '<td>'.__('ID', 'event_espresso').'</td>'; |
|
784 | + $registrations_to_apply_payment_to .= '<td>'.__('Registrant', 'event_espresso').'</td>'; |
|
785 | + $registrations_to_apply_payment_to .= '<td>'.__('Ticket', 'event_espresso').'</td>'; |
|
786 | + $registrations_to_apply_payment_to .= '<td>'.__('Event', 'event_espresso').'</td>'; |
|
787 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">'.__('Paid', 'event_espresso').'</td>'; |
|
788 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">'.__('Owing', 'event_espresso').'</td>'; |
|
789 | + $registrations_to_apply_payment_to .= '<td class="jst-cntr">'.__('Apply', 'event_espresso').'</td>'; |
|
790 | 790 | $registrations_to_apply_payment_to .= '</tr></thead><tbody>'; |
791 | 791 | // get registrations for TXN |
792 | - $registrations = $this->_transaction->registrations( $query_params ); |
|
793 | - foreach ( $registrations as $registration ) { |
|
794 | - if ( $registration instanceof EE_Registration ) { |
|
792 | + $registrations = $this->_transaction->registrations($query_params); |
|
793 | + foreach ($registrations as $registration) { |
|
794 | + if ($registration instanceof EE_Registration) { |
|
795 | 795 | $owing = $registration->final_price() - $registration->paid(); |
796 | - $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> ' . __( '+ tax', 'event_espresso' ) . '</span>' : ''; |
|
797 | - $checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments ) ? ' checked="checked"' : ''; |
|
798 | - $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-' . $registration->ID() . '">'; |
|
796 | + $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> '.__('+ tax', 'event_espresso').'</span>' : ''; |
|
797 | + $checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments) ? ' checked="checked"' : ''; |
|
798 | + $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-'.$registration->ID().'">'; |
|
799 | 799 | // add html for checkbox input and label |
800 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ID() . '</td>'; |
|
801 | - $registrations_to_apply_payment_to .= '<td>' . $registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ) . '</td>'; |
|
802 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable . '</td>'; |
|
803 | - $registrations_to_apply_payment_to .= '<td>' . $registration->event_name() . '</td>'; |
|
804 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">' . $registration->pretty_paid() . '</td>'; |
|
805 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">' . EEH_Template::format_currency( $owing ) . '</td>'; |
|
800 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ID().'</td>'; |
|
801 | + $registrations_to_apply_payment_to .= '<td>'.$registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __('Unknown Attendee', 'event_espresso').'</td>'; |
|
802 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable.'</td>'; |
|
803 | + $registrations_to_apply_payment_to .= '<td>'.$registration->event_name().'</td>'; |
|
804 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">'.$registration->pretty_paid().'</td>'; |
|
805 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">'.EEH_Template::format_currency($owing).'</td>'; |
|
806 | 806 | $registrations_to_apply_payment_to .= '<td class="jst-cntr">'; |
807 | 807 | $disabled = $registration->final_price() > 0 ? '' : ' disabled'; |
808 | - $registrations_to_apply_payment_to .= '<input type="checkbox" value="' . $registration->ID() . '" name="txn_admin_payment[registrations]"' . $checked . $disabled . '>'; |
|
808 | + $registrations_to_apply_payment_to .= '<input type="checkbox" value="'.$registration->ID().'" name="txn_admin_payment[registrations]"'.$checked.$disabled.'>'; |
|
809 | 809 | $registrations_to_apply_payment_to .= '</td>'; |
810 | 810 | $registrations_to_apply_payment_to .= '</tr>'; |
811 | 811 | } |
812 | 812 | } |
813 | 813 | $registrations_to_apply_payment_to .= '</tbody></table></div>'; |
814 | - $registrations_to_apply_payment_to .= '<p class="clear description">' . __( 'The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso' ) . '</p></div>'; |
|
815 | - $this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to; |
|
814 | + $registrations_to_apply_payment_to .= '<p class="clear description">'.__('The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso').'</p></div>'; |
|
815 | + $this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to; |
|
816 | 816 | } |
817 | 817 | |
818 | 818 | |
@@ -829,9 +829,9 @@ discard block |
||
829 | 829 | $statuses = EEM_Registration::reg_status_array(array(), TRUE); |
830 | 830 | //let's add a "don't change" option. |
831 | 831 | $status_array['NAN'] = __('Leave the Same', 'event_espresso'); |
832 | - $status_array = array_merge( $status_array, $statuses ); |
|
833 | - $this->_template_args['status_change_select'] = EEH_Form_Fields::select_input( 'txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status' ); |
|
834 | - $this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input( 'delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status' ); |
|
832 | + $status_array = array_merge($status_array, $statuses); |
|
833 | + $this->_template_args['status_change_select'] = EEH_Form_Fields::select_input('txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status'); |
|
834 | + $this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input('delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status'); |
|
835 | 835 | |
836 | 836 | } |
837 | 837 | |
@@ -846,21 +846,21 @@ discard block |
||
846 | 846 | * @param EE_Payment[] to show on this page |
847 | 847 | * @return void |
848 | 848 | */ |
849 | - private function _get_payment_methods( $payments = array() ) { |
|
849 | + private function _get_payment_methods($payments = array()) { |
|
850 | 850 | $payment_methods_of_payments = array(); |
851 | - foreach( $payments as $payment ){ |
|
852 | - if( $payment instanceof EE_Payment ){ |
|
853 | - $payment_methods_of_payments[] = $payment->get( 'PMD_ID' ); |
|
851 | + foreach ($payments as $payment) { |
|
852 | + if ($payment instanceof EE_Payment) { |
|
853 | + $payment_methods_of_payments[] = $payment->get('PMD_ID'); |
|
854 | 854 | } |
855 | 855 | } |
856 | - if( $payment_methods_of_payments ){ |
|
857 | - $query_args = array( array( 'OR*payment_method_for_payment' => array( |
|
858 | - 'PMD_ID' => array( 'IN', $payment_methods_of_payments ), |
|
859 | - 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) ); |
|
860 | - }else{ |
|
861 | - $query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ); |
|
856 | + if ($payment_methods_of_payments) { |
|
857 | + $query_args = array(array('OR*payment_method_for_payment' => array( |
|
858 | + 'PMD_ID' => array('IN', $payment_methods_of_payments), |
|
859 | + 'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') ))); |
|
860 | + } else { |
|
861 | + $query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%'))); |
|
862 | 862 | } |
863 | - $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args ); |
|
863 | + $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args); |
|
864 | 864 | } |
865 | 865 | |
866 | 866 | |
@@ -874,46 +874,46 @@ discard block |
||
874 | 874 | * @param array $metabox |
875 | 875 | * @return void |
876 | 876 | */ |
877 | - public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) { |
|
877 | + public function txn_attendees_meta_box($post, $metabox = array('args' => array())) { |
|
878 | 878 | |
879 | - extract( $metabox['args'] ); |
|
879 | + extract($metabox['args']); |
|
880 | 880 | $this->_template_args['post'] = $post; |
881 | 881 | $this->_template_args['event_attendees'] = array(); |
882 | 882 | // process items in cart |
883 | - $line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) ); |
|
884 | - if ( ! empty( $line_items )) { |
|
885 | - foreach ( $line_items as $item ) { |
|
886 | - if ( $item instanceof EE_Line_Item ) { |
|
887 | - switch( $item->OBJ_type() ) { |
|
883 | + $line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item'))); |
|
884 | + if ( ! empty($line_items)) { |
|
885 | + foreach ($line_items as $item) { |
|
886 | + if ($item instanceof EE_Line_Item) { |
|
887 | + switch ($item->OBJ_type()) { |
|
888 | 888 | |
889 | 889 | case 'Event' : |
890 | 890 | break; |
891 | 891 | |
892 | 892 | case 'Ticket' : |
893 | 893 | $ticket = $item->ticket(); |
894 | - if ( empty( $ticket )) { |
|
894 | + if (empty($ticket)) { |
|
895 | 895 | continue; //right now we're only handling tickets here. Cause its expected that only tickets will have attendees right? |
896 | 896 | } |
897 | - $ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' )); |
|
897 | + $ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price')); |
|
898 | 898 | $event = $ticket->get_first_related('Registration')->get_first_related('Event'); |
899 | - $event_name = $event instanceof EE_Event ? $event->get('EVT_name') . ' - ' . $item->get('LIN_name') : ''; |
|
899 | + $event_name = $event instanceof EE_Event ? $event->get('EVT_name').' - '.$item->get('LIN_name') : ''; |
|
900 | 900 | |
901 | - $registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() ))); |
|
902 | - foreach( $registrations as $registration ) { |
|
903 | - $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
904 | - $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
905 | - $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
901 | + $registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID()))); |
|
902 | + foreach ($registrations as $registration) { |
|
903 | + $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
904 | + $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
905 | + $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
906 | 906 | // attendee info |
907 | 907 | $attendee = $registration->get_first_related('Attendee'); |
908 | - if ( $attendee instanceof EE_Attendee ) { |
|
908 | + if ($attendee instanceof EE_Attendee) { |
|
909 | 909 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = $attendee->ID(); |
910 | 910 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = $attendee->full_name(); |
911 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:' . $attendee->email() . '?subject=' . $event->get('EVT_name') . __(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>'; |
|
912 | - $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array() ); |
|
911 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event->get('EVT_name').__(' Event', 'event_espresso').'">'.$attendee->email().'</a>'; |
|
912 | + $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array()); |
|
913 | 913 | } else { |
914 | 914 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = ''; |
915 | 915 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = ''; |
916 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
916 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
917 | 917 | $this->_template_args['event_attendees'][$registration->ID()]['address'] = ''; |
918 | 918 | } |
919 | 919 | } |
@@ -923,12 +923,12 @@ discard block |
||
923 | 923 | } |
924 | 924 | } |
925 | 925 | |
926 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees' ), TXN_ADMIN_URL ); |
|
927 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE ); |
|
926 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL); |
|
927 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE); |
|
928 | 928 | |
929 | 929 | } else { |
930 | 930 | echo sprintf( |
931 | - __( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ), |
|
931 | + __('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'), |
|
932 | 932 | '<p class="important-notice">', |
933 | 933 | '</p>' |
934 | 934 | ); |
@@ -947,20 +947,20 @@ discard block |
||
947 | 947 | */ |
948 | 948 | public function txn_registrant_side_meta_box() { |
949 | 949 | $primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null; |
950 | - if ( ! $primary_att instanceof EE_Attendee ) { |
|
950 | + if ( ! $primary_att instanceof EE_Attendee) { |
|
951 | 951 | $this->_template_args['no_attendee_message'] = __('There is no attached contact for this transaction. The transaction either failed due to an error or was abandoned.', 'event_espresso'); |
952 | 952 | $primary_att = EEM_Attendee::instance()->create_default_object(); |
953 | 953 | } |
954 | - $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
954 | + $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
955 | 955 | $this->_template_args['prime_reg_fname'] = $primary_att->fname(); |
956 | 956 | $this->_template_args['prime_reg_lname'] = $primary_att->lname(); |
957 | - $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
957 | + $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
958 | 958 | $this->_template_args['prime_reg_phone'] = $primary_att->phone(); |
959 | - $this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit_attendee', 'post' => $primary_att->ID() ), REG_ADMIN_URL ); |
|
959 | + $this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit_attendee', 'post' => $primary_att->ID()), REG_ADMIN_URL); |
|
960 | 960 | // get formatted address for registrant |
961 | - EE_Registry::instance()->load_helper( 'Formatter' ); |
|
962 | - $this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att ); |
|
963 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE ); |
|
961 | + EE_Registry::instance()->load_helper('Formatter'); |
|
962 | + $this->_template_args['formatted_address'] = EEH_Address::format($primary_att); |
|
963 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE); |
|
964 | 964 | } |
965 | 965 | |
966 | 966 | |
@@ -976,12 +976,12 @@ discard block |
||
976 | 976 | |
977 | 977 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
978 | 978 | $this->_template_args['billing_form_url'] = add_query_arg( |
979 | - array( 'action' => 'edit_transaction', 'process' => 'billing' ), |
|
979 | + array('action' => 'edit_transaction', 'process' => 'billing'), |
|
980 | 980 | TXN_ADMIN_URL |
981 | 981 | ); |
982 | 982 | |
983 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
984 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/ |
|
983 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
984 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/ |
|
985 | 985 | } |
986 | 986 | |
987 | 987 | |
@@ -994,43 +994,43 @@ discard block |
||
994 | 994 | * @return void |
995 | 995 | */ |
996 | 996 | public function apply_payments_or_refunds() { |
997 | - $json_response_data = array( 'return_data' => FALSE ); |
|
997 | + $json_response_data = array('return_data' => FALSE); |
|
998 | 998 | $valid_data = $this->_validate_payment_request_data(); |
999 | - if ( ! empty( $valid_data ) ) { |
|
1000 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
999 | + if ( ! empty($valid_data)) { |
|
1000 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1001 | 1001 | //save the new payment |
1002 | - $payment = $this->_create_payment_from_request_data( $valid_data ); |
|
1002 | + $payment = $this->_create_payment_from_request_data($valid_data); |
|
1003 | 1003 | // get the TXN for this payment |
1004 | 1004 | $transaction = $payment->transaction(); |
1005 | 1005 | // verify transaction |
1006 | - if ( $transaction instanceof EE_Transaction ) { |
|
1006 | + if ($transaction instanceof EE_Transaction) { |
|
1007 | 1007 | // calculate_total_payments_and_update_status |
1008 | - $this->_process_transaction_payments( $transaction ); |
|
1009 | - $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment ); |
|
1010 | - $this->_remove_existing_registration_payments( $payment, $PAY_ID ); |
|
1008 | + $this->_process_transaction_payments($transaction); |
|
1009 | + $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment); |
|
1010 | + $this->_remove_existing_registration_payments($payment, $PAY_ID); |
|
1011 | 1011 | // apply payment to registrations (if applicable) |
1012 | - if ( ! empty( $REG_IDs ) ) { |
|
1013 | - $this->_update_registration_payments( $transaction, $payment, $REG_IDs ); |
|
1012 | + if ( ! empty($REG_IDs)) { |
|
1013 | + $this->_update_registration_payments($transaction, $payment, $REG_IDs); |
|
1014 | 1014 | $this->_maybe_send_notifications(); |
1015 | 1015 | // now process status changes for the same registrations |
1016 | - $this->_process_registration_status_change( $transaction, $REG_IDs ); |
|
1016 | + $this->_process_registration_status_change($transaction, $REG_IDs); |
|
1017 | 1017 | } |
1018 | - $this->_maybe_send_notifications( $payment ); |
|
1018 | + $this->_maybe_send_notifications($payment); |
|
1019 | 1019 | //prepare to render page |
1020 | - $json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs ); |
|
1021 | - do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment ); |
|
1020 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs); |
|
1021 | + do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment); |
|
1022 | 1022 | } else { |
1023 | 1023 | EE_Error::add_error( |
1024 | - __( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ), |
|
1024 | + __('A valid Transaction for this payment could not be retrieved.', 'event_espresso'), |
|
1025 | 1025 | __FILE__, __FUNCTION__, __LINE__ |
1026 | 1026 | ); |
1027 | 1027 | } |
1028 | 1028 | } else { |
1029 | - EE_Error::add_error( __( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1029 | + EE_Error::add_error(__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1030 | 1030 | } |
1031 | 1031 | |
1032 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
1033 | - echo json_encode( array_merge( $json_response_data, $notices )); |
|
1032 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
1033 | + echo json_encode(array_merge($json_response_data, $notices)); |
|
1034 | 1034 | die(); |
1035 | 1035 | } |
1036 | 1036 | |
@@ -1042,30 +1042,30 @@ discard block |
||
1042 | 1042 | * @return array |
1043 | 1043 | */ |
1044 | 1044 | protected function _validate_payment_request_data() { |
1045 | - if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) { |
|
1045 | + if ( ! isset($this->_req_data['txn_admin_payment'])) { |
|
1046 | 1046 | return false; |
1047 | 1047 | } |
1048 | 1048 | $payment_form = $this->_generate_payment_form_section(); |
1049 | 1049 | try { |
1050 | - if ( $payment_form->was_submitted() ) { |
|
1050 | + if ($payment_form->was_submitted()) { |
|
1051 | 1051 | $payment_form->receive_form_submission(); |
1052 | - if ( ! $payment_form->is_valid() ) { |
|
1052 | + if ( ! $payment_form->is_valid()) { |
|
1053 | 1053 | $submission_error_messages = array(); |
1054 | - foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) { |
|
1055 | - if ( $validation_error instanceof EE_Validation_Error ) { |
|
1054 | + foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) { |
|
1055 | + if ($validation_error instanceof EE_Validation_Error) { |
|
1056 | 1056 | $submission_error_messages[] = sprintf( |
1057 | - _x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ), |
|
1057 | + _x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'), |
|
1058 | 1058 | $validation_error->get_form_section()->html_label_text(), |
1059 | 1059 | $validation_error->getMessage() |
1060 | 1060 | ); |
1061 | 1061 | } |
1062 | 1062 | } |
1063 | - EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1063 | + EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__); |
|
1064 | 1064 | return array(); |
1065 | 1065 | } |
1066 | 1066 | } |
1067 | - } catch ( EE_Error $e ) { |
|
1068 | - EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ ); |
|
1067 | + } catch (EE_Error $e) { |
|
1068 | + EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__); |
|
1069 | 1069 | return array(); |
1070 | 1070 | } |
1071 | 1071 | return $payment_form->valid_data(); |
@@ -1087,63 +1087,63 @@ discard block |
||
1087 | 1087 | array( |
1088 | 1088 | 'default' => 0, |
1089 | 1089 | 'required' => false, |
1090 | - 'html_label_text' => __( 'Payment ID', 'event_espresso' ), |
|
1091 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1090 | + 'html_label_text' => __('Payment ID', 'event_espresso'), |
|
1091 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1092 | 1092 | ) |
1093 | 1093 | ), |
1094 | 1094 | 'TXN_ID' => new EE_Text_Input( |
1095 | 1095 | array( |
1096 | 1096 | 'default' => 0, |
1097 | 1097 | 'required' => true, |
1098 | - 'html_label_text' => __( 'Transaction ID', 'event_espresso' ), |
|
1099 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1098 | + 'html_label_text' => __('Transaction ID', 'event_espresso'), |
|
1099 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1100 | 1100 | ) |
1101 | 1101 | ), |
1102 | 1102 | 'type' => new EE_Text_Input( |
1103 | 1103 | array( |
1104 | 1104 | 'default' => 1, |
1105 | 1105 | 'required' => true, |
1106 | - 'html_label_text' => __( 'Payment or Refund', 'event_espresso' ), |
|
1107 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1106 | + 'html_label_text' => __('Payment or Refund', 'event_espresso'), |
|
1107 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1108 | 1108 | ) |
1109 | 1109 | ), |
1110 | 1110 | 'amount' => new EE_Text_Input( |
1111 | 1111 | array( |
1112 | 1112 | 'default' => 0, |
1113 | 1113 | 'required' => true, |
1114 | - 'html_label_text' => __( 'Payment amount', 'event_espresso' ), |
|
1115 | - 'validation_strategies' => array( new EE_Float_Normalization() ) |
|
1114 | + 'html_label_text' => __('Payment amount', 'event_espresso'), |
|
1115 | + 'validation_strategies' => array(new EE_Float_Normalization()) |
|
1116 | 1116 | ) |
1117 | 1117 | ), |
1118 | 1118 | 'status' => new EE_Text_Input( |
1119 | 1119 | array( |
1120 | 1120 | 'default' => EEM_Payment::status_id_approved, |
1121 | 1121 | 'required' => true, |
1122 | - 'html_label_text' => __( 'Payment status', 'event_espresso' ), |
|
1122 | + 'html_label_text' => __('Payment status', 'event_espresso'), |
|
1123 | 1123 | ) |
1124 | 1124 | ), |
1125 | 1125 | 'PMD_ID' => new EE_Text_Input( |
1126 | 1126 | array( |
1127 | 1127 | 'default' => 2, |
1128 | 1128 | 'required' => true, |
1129 | - 'html_label_text' => __( 'Payment Method', 'event_espresso' ), |
|
1130 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1129 | + 'html_label_text' => __('Payment Method', 'event_espresso'), |
|
1130 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1131 | 1131 | ) |
1132 | 1132 | ), |
1133 | 1133 | 'date' => new EE_Text_Input( |
1134 | 1134 | array( |
1135 | 1135 | 'default' => time(), |
1136 | 1136 | 'required' => true, |
1137 | - 'html_label_text' => __( 'Payment date', 'event_espresso' ), |
|
1137 | + 'html_label_text' => __('Payment date', 'event_espresso'), |
|
1138 | 1138 | ) |
1139 | 1139 | ), |
1140 | 1140 | 'txn_id_chq_nmbr' => new EE_Text_Input( |
1141 | 1141 | array( |
1142 | 1142 | 'default' => '', |
1143 | 1143 | 'required' => false, |
1144 | - 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
|
1144 | + 'html_label_text' => __('Transaction or Cheque Number', 'event_espresso'), |
|
1145 | 1145 | 'validation_strategies' => array( |
1146 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1146 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1147 | 1147 | ) |
1148 | 1148 | ) |
1149 | 1149 | ), |
@@ -1151,9 +1151,9 @@ discard block |
||
1151 | 1151 | array( |
1152 | 1152 | 'default' => '', |
1153 | 1153 | 'required' => false, |
1154 | - 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
|
1154 | + 'html_label_text' => __('Purchase Order Number', 'event_espresso'), |
|
1155 | 1155 | 'validation_strategies' => array( |
1156 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1156 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1157 | 1157 | ) |
1158 | 1158 | ) |
1159 | 1159 | ), |
@@ -1161,9 +1161,9 @@ discard block |
||
1161 | 1161 | array( |
1162 | 1162 | 'default' => '', |
1163 | 1163 | 'required' => false, |
1164 | - 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
|
1164 | + 'html_label_text' => __('Extra Field for Accounting', 'event_espresso'), |
|
1165 | 1165 | 'validation_strategies' => array( |
1166 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1166 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1167 | 1167 | ) |
1168 | 1168 | ) |
1169 | 1169 | ), |
@@ -1180,37 +1180,37 @@ discard block |
||
1180 | 1180 | * @param array $valid_data |
1181 | 1181 | * @return EE_Payment |
1182 | 1182 | */ |
1183 | - protected function _create_payment_from_request_data( $valid_data ) { |
|
1184 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
1183 | + protected function _create_payment_from_request_data($valid_data) { |
|
1184 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1185 | 1185 | // get payment amount |
1186 | - $amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0; |
|
1186 | + $amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0; |
|
1187 | 1187 | // payments have a type value of 1 and refunds have a type value of -1 |
1188 | 1188 | // so multiplying amount by type will give a positive value for payments, and negative values for refunds |
1189 | - $amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount; |
|
1189 | + $amount = $valid_data['type'] < 0 ? $amount * -1 : $amount; |
|
1190 | 1190 | // for some reason the date string coming in has extra spaces between the date and time. This fixes that. |
1191 | - $date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) ); |
|
1191 | + $date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp')); |
|
1192 | 1192 | $payment = EE_Payment::new_instance( |
1193 | 1193 | array( |
1194 | - 'TXN_ID' => $valid_data[ 'TXN_ID' ], |
|
1195 | - 'STS_ID' => $valid_data[ 'status' ], |
|
1194 | + 'TXN_ID' => $valid_data['TXN_ID'], |
|
1195 | + 'STS_ID' => $valid_data['status'], |
|
1196 | 1196 | 'PAY_timestamp' => $date, |
1197 | 1197 | 'PAY_source' => EEM_Payment_Method::scope_admin, |
1198 | - 'PMD_ID' => $valid_data[ 'PMD_ID' ], |
|
1198 | + 'PMD_ID' => $valid_data['PMD_ID'], |
|
1199 | 1199 | 'PAY_amount' => $amount, |
1200 | - 'PAY_txn_id_chq_nmbr' => $valid_data[ 'txn_id_chq_nmbr' ], |
|
1201 | - 'PAY_po_number' => $valid_data[ 'po_number' ], |
|
1202 | - 'PAY_extra_accntng' => $valid_data[ 'accounting' ], |
|
1200 | + 'PAY_txn_id_chq_nmbr' => $valid_data['txn_id_chq_nmbr'], |
|
1201 | + 'PAY_po_number' => $valid_data['po_number'], |
|
1202 | + 'PAY_extra_accntng' => $valid_data['accounting'], |
|
1203 | 1203 | 'PAY_details' => $valid_data, |
1204 | 1204 | 'PAY_ID' => $PAY_ID |
1205 | 1205 | ), |
1206 | 1206 | '', |
1207 | - array( 'Y-m-d', 'g:i a' ) |
|
1207 | + array('Y-m-d', 'g:i a') |
|
1208 | 1208 | ); |
1209 | 1209 | |
1210 | - if ( ! $payment->save() ) { |
|
1210 | + if ( ! $payment->save()) { |
|
1211 | 1211 | EE_Error::add_error( |
1212 | 1212 | sprintf( |
1213 | - __( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ), |
|
1213 | + __('Payment %1$d has not been successfully saved to the database.', 'event_espresso'), |
|
1214 | 1214 | $payment->ID() |
1215 | 1215 | ), |
1216 | 1216 | __FILE__, __FUNCTION__, __LINE__ |
@@ -1227,15 +1227,15 @@ discard block |
||
1227 | 1227 | * @param \EE_Transaction $transaction |
1228 | 1228 | * @return array |
1229 | 1229 | */ |
1230 | - protected function _process_transaction_payments( EE_Transaction $transaction ) { |
|
1230 | + protected function _process_transaction_payments(EE_Transaction $transaction) { |
|
1231 | 1231 | /** @type EE_Transaction_Payments $transaction_payments */ |
1232 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1232 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1233 | 1233 | //update the transaction with this payment |
1234 | - if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) { |
|
1235 | - EE_Error::add_success( __( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1234 | + if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) { |
|
1235 | + EE_Error::add_success(__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1236 | 1236 | } else { |
1237 | 1237 | EE_Error::add_error( |
1238 | - __( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' ) |
|
1238 | + __('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso') |
|
1239 | 1239 | , __FILE__, __FUNCTION__, __LINE__ |
1240 | 1240 | ); |
1241 | 1241 | } |
@@ -1251,19 +1251,19 @@ discard block |
||
1251 | 1251 | * @param \EE_Payment $payment |
1252 | 1252 | * @return array |
1253 | 1253 | */ |
1254 | - protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) { |
|
1254 | + protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) { |
|
1255 | 1255 | $REG_IDs = array(); |
1256 | 1256 | // grab array of IDs for specific registrations to apply changes to |
1257 | - if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) { |
|
1258 | - $REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ]; |
|
1257 | + if (isset($this->_req_data['txn_admin_payment']['registrations'])) { |
|
1258 | + $REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations']; |
|
1259 | 1259 | } |
1260 | 1260 | //nothing specified ? then get all reg IDs |
1261 | - if ( empty( $REG_IDs ) ) { |
|
1261 | + if (empty($REG_IDs)) { |
|
1262 | 1262 | $registrations = $payment->transaction()->registrations(); |
1263 | - $REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1263 | + $REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1264 | 1264 | } |
1265 | 1265 | // ensure that REG_IDs are integers and NOT strings |
1266 | - return array_map( 'intval', $REG_IDs ); |
|
1266 | + return array_map('intval', $REG_IDs); |
|
1267 | 1267 | } |
1268 | 1268 | |
1269 | 1269 | |
@@ -1280,7 +1280,7 @@ discard block |
||
1280 | 1280 | /** |
1281 | 1281 | * @param array $existing_reg_payment_REG_IDs |
1282 | 1282 | */ |
1283 | - public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) { |
|
1283 | + public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) { |
|
1284 | 1284 | $this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs; |
1285 | 1285 | } |
1286 | 1286 | |
@@ -1295,13 +1295,13 @@ discard block |
||
1295 | 1295 | * @param \EE_Payment $payment |
1296 | 1296 | * @return array |
1297 | 1297 | */ |
1298 | - protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) { |
|
1299 | - if ( $this->existing_reg_payment_REG_IDs() === null ) { |
|
1298 | + protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) { |
|
1299 | + if ($this->existing_reg_payment_REG_IDs() === null) { |
|
1300 | 1300 | // let's get any existing reg payment records for this payment |
1301 | - $existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' ); |
|
1301 | + $existing_reg_payment_REG_IDs = $payment->get_many_related('Registration'); |
|
1302 | 1302 | // but we only want the REG IDs, so grab the array keys |
1303 | - $existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array(); |
|
1304 | - $this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs ); |
|
1303 | + $existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array(); |
|
1304 | + $this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs); |
|
1305 | 1305 | } |
1306 | 1306 | return $this->existing_reg_payment_REG_IDs(); |
1307 | 1307 | } |
@@ -1320,23 +1320,23 @@ discard block |
||
1320 | 1320 | * @param int $PAY_ID |
1321 | 1321 | * @return bool; |
1322 | 1322 | */ |
1323 | - protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) { |
|
1323 | + protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) { |
|
1324 | 1324 | // newly created payments will have nothing recorded for $PAY_ID |
1325 | - if ( $PAY_ID == 0 ) { |
|
1325 | + if ($PAY_ID == 0) { |
|
1326 | 1326 | return false; |
1327 | 1327 | } |
1328 | - $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1329 | - if ( empty( $existing_reg_payment_REG_IDs )) { |
|
1328 | + $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1329 | + if (empty($existing_reg_payment_REG_IDs)) { |
|
1330 | 1330 | return false; |
1331 | 1331 | } |
1332 | 1332 | /** @type EE_Transaction_Payments $transaction_payments */ |
1333 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1333 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1334 | 1334 | return $transaction_payments->delete_registration_payments_and_update_registrations( |
1335 | 1335 | $payment, |
1336 | 1336 | array( |
1337 | 1337 | array( |
1338 | 1338 | 'PAY_ID' => $payment->ID(), |
1339 | - 'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ), |
|
1339 | + 'REG_ID' => array('IN', $existing_reg_payment_REG_IDs), |
|
1340 | 1340 | ) |
1341 | 1341 | ) |
1342 | 1342 | ); |
@@ -1355,25 +1355,25 @@ discard block |
||
1355 | 1355 | * @param array $REG_IDs |
1356 | 1356 | * @return bool |
1357 | 1357 | */ |
1358 | - protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
|
1358 | + protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) { |
|
1359 | 1359 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
1360 | 1360 | // so let's do that using our set of REG_IDs from the form |
1361 | 1361 | $registration_query_where_params = array( |
1362 | - 'REG_ID' => array( 'IN', $REG_IDs ) |
|
1362 | + 'REG_ID' => array('IN', $REG_IDs) |
|
1363 | 1363 | ); |
1364 | 1364 | // but add in some conditions regarding payment, |
1365 | 1365 | // so that we don't apply payments to registrations that are free or have already been paid for |
1366 | 1366 | // but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative ) |
1367 | - if ( ! $payment->is_a_refund() ) { |
|
1368 | - $registration_query_where_params[ 'REG_final_price' ] = array( '!=', 0 ); |
|
1369 | - $registration_query_where_params[ 'REG_final_price*' ] = array( '!=', 'REG_paid', true ); |
|
1367 | + if ( ! $payment->is_a_refund()) { |
|
1368 | + $registration_query_where_params['REG_final_price'] = array('!=', 0); |
|
1369 | + $registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true); |
|
1370 | 1370 | } |
1371 | 1371 | //EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ ); |
1372 | - $registrations = $transaction->registrations( array( $registration_query_where_params ) ); |
|
1373 | - if ( ! empty( $registrations ) ) { |
|
1372 | + $registrations = $transaction->registrations(array($registration_query_where_params)); |
|
1373 | + if ( ! empty($registrations)) { |
|
1374 | 1374 | /** @type EE_Payment_Processor $payment_processor */ |
1375 | - $payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' ); |
|
1376 | - $payment_processor->process_registration_payments( $transaction, $payment, $registrations ); |
|
1375 | + $payment_processor = EE_Registry::instance()->load_core('Payment_Processor'); |
|
1376 | + $payment_processor->process_registration_payments($transaction, $payment, $registrations); |
|
1377 | 1377 | } |
1378 | 1378 | } |
1379 | 1379 | |
@@ -1389,22 +1389,22 @@ discard block |
||
1389 | 1389 | * @param array $REG_IDs |
1390 | 1390 | * @return bool |
1391 | 1391 | */ |
1392 | - protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) { |
|
1392 | + protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) { |
|
1393 | 1393 | // first if there is no change in status then we get out. |
1394 | 1394 | if ( |
1395 | - ! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ) |
|
1395 | + ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status']) |
|
1396 | 1396 | || $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN' |
1397 | 1397 | ) { |
1398 | 1398 | //no error message, no change requested, just nothing to do man. |
1399 | 1399 | return FALSE; |
1400 | 1400 | } |
1401 | 1401 | /** @type EE_Transaction_Processor $transaction_processor */ |
1402 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
1402 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
1403 | 1403 | // made it here dude? Oh WOW. K, let's take care of changing the statuses |
1404 | 1404 | return $transaction_processor->manually_update_registration_statuses( |
1405 | 1405 | $transaction, |
1406 | - sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ), |
|
1407 | - array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) |
|
1406 | + sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']), |
|
1407 | + array(array('REG_ID' => array('IN', $REG_IDs))) |
|
1408 | 1408 | ); |
1409 | 1409 | } |
1410 | 1410 | |
@@ -1419,16 +1419,16 @@ discard block |
||
1419 | 1419 | * @param bool | null $delete_txn_reg_status_change |
1420 | 1420 | * @return array |
1421 | 1421 | */ |
1422 | - protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) { |
|
1422 | + protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) { |
|
1423 | 1423 | // was the payment deleted ? |
1424 | - if ( is_bool( $delete_txn_reg_status_change )) { |
|
1424 | + if (is_bool($delete_txn_reg_status_change)) { |
|
1425 | 1425 | return array( |
1426 | 1426 | 'PAY_ID' => $payment->ID(), |
1427 | 1427 | 'amount' => $payment->amount(), |
1428 | 1428 | 'total_paid' => $payment->transaction()->paid(), |
1429 | 1429 | 'txn_status' => $payment->transaction()->status_ID(), |
1430 | 1430 | 'pay_status' => $payment->STS_ID(), |
1431 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1431 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1432 | 1432 | 'delete_txn_reg_status_change' => $delete_txn_reg_status_change, |
1433 | 1433 | ); |
1434 | 1434 | } else { |
@@ -1440,16 +1440,16 @@ discard block |
||
1440 | 1440 | 'pay_status' => $payment->STS_ID(), |
1441 | 1441 | 'PAY_ID' => $payment->ID(), |
1442 | 1442 | 'STS_ID' => $payment->STS_ID(), |
1443 | - 'status' => self::$_pay_status[ $payment->STS_ID() ], |
|
1444 | - 'date' => $payment->timestamp( 'Y-m-d', 'h:i a' ), |
|
1445 | - 'method' => strtoupper( $payment->source() ), |
|
1443 | + 'status' => self::$_pay_status[$payment->STS_ID()], |
|
1444 | + 'date' => $payment->timestamp('Y-m-d', 'h:i a'), |
|
1445 | + 'method' => strtoupper($payment->source()), |
|
1446 | 1446 | 'PM_ID' => $payment->payment_method() ? $payment->payment_method()->ID() : 1, |
1447 | - 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __( "Unknown", 'event_espresso' ), |
|
1447 | + 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'), |
|
1448 | 1448 | 'gateway_response' => $payment->gateway_response(), |
1449 | 1449 | 'txn_id_chq_nmbr' => $payment->txn_id_chq_nmbr(), |
1450 | 1450 | 'po_number' => $payment->po_number(), |
1451 | 1451 | 'extra_accntng' => $payment->extra_accntng(), |
1452 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1452 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1453 | 1453 | ); |
1454 | 1454 | } |
1455 | 1455 | } |
@@ -1464,42 +1464,42 @@ discard block |
||
1464 | 1464 | * @return void |
1465 | 1465 | */ |
1466 | 1466 | public function delete_payment() { |
1467 | - $json_response_data = array( 'return_data' => FALSE ); |
|
1468 | - $PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0; |
|
1469 | - if ( $PAY_ID ) { |
|
1470 | - $delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false; |
|
1471 | - $payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID ); |
|
1472 | - if ( $payment instanceof EE_Payment ) { |
|
1473 | - $REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1467 | + $json_response_data = array('return_data' => FALSE); |
|
1468 | + $PAY_ID = isset($this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID']) ? absint($this->_req_data['delete_txn_admin_payment']['PAY_ID']) : 0; |
|
1469 | + if ($PAY_ID) { |
|
1470 | + $delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false; |
|
1471 | + $payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID); |
|
1472 | + if ($payment instanceof EE_Payment) { |
|
1473 | + $REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1474 | 1474 | /** @type EE_Transaction_Payments $transaction_payments */ |
1475 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1476 | - if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) { |
|
1477 | - EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) ); |
|
1478 | - $json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change ); |
|
1479 | - if ( $delete_txn_reg_status_change ) { |
|
1475 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1476 | + if ($transaction_payments->delete_payment_and_update_transaction($payment)) { |
|
1477 | + EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso')); |
|
1478 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change); |
|
1479 | + if ($delete_txn_reg_status_change) { |
|
1480 | 1480 | $this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1481 | 1481 | //MAKE sure we also add the delete_txn_req_status_change to the |
1482 | 1482 | //$_REQUEST global because that's how messages will be looking for it. |
1483 | 1483 | $_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1484 | 1484 | $this->_maybe_send_notifications(); |
1485 | - $this->_process_registration_status_change( $payment->transaction(), $REG_IDs ); |
|
1485 | + $this->_process_registration_status_change($payment->transaction(), $REG_IDs); |
|
1486 | 1486 | //$this->_maybe_send_notifications( $payment ); |
1487 | 1487 | } |
1488 | 1488 | } |
1489 | 1489 | } else { |
1490 | 1490 | EE_Error::add_error( |
1491 | - __( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ), |
|
1491 | + __('Valid Payment data could not be retrieved from the database.', 'event_espresso'), |
|
1492 | 1492 | __FILE__, __FUNCTION__, __LINE__ |
1493 | 1493 | ); |
1494 | 1494 | } |
1495 | 1495 | } else { |
1496 | 1496 | EE_Error::add_error( |
1497 | - __( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ), |
|
1497 | + __('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'), |
|
1498 | 1498 | __FILE__, __FUNCTION__, __LINE__ |
1499 | 1499 | ); |
1500 | 1500 | } |
1501 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
1502 | - echo json_encode( array_merge( $json_response_data, $notices )); |
|
1501 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
1502 | + echo json_encode(array_merge($json_response_data, $notices)); |
|
1503 | 1503 | die(); |
1504 | 1504 | } |
1505 | 1505 | |
@@ -1513,17 +1513,17 @@ discard block |
||
1513 | 1513 | * @param array $REG_IDs |
1514 | 1514 | * @return array |
1515 | 1515 | */ |
1516 | - protected function _registration_payment_data_array( $REG_IDs ) { |
|
1516 | + protected function _registration_payment_data_array($REG_IDs) { |
|
1517 | 1517 | $registration_payment_data = array(); |
1518 | 1518 | //if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows. |
1519 | - if ( ! empty( $REG_IDs ) ) { |
|
1520 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
1521 | - $registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) ); |
|
1522 | - foreach ( $registrations as $registration ) { |
|
1523 | - if ( $registration instanceof EE_Registration ) { |
|
1524 | - $registration_payment_data[ $registration->ID() ] = array( |
|
1519 | + if ( ! empty($REG_IDs)) { |
|
1520 | + EE_Registry::instance()->load_helper('Template'); |
|
1521 | + $registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs)))); |
|
1522 | + foreach ($registrations as $registration) { |
|
1523 | + if ($registration instanceof EE_Registration) { |
|
1524 | + $registration_payment_data[$registration->ID()] = array( |
|
1525 | 1525 | 'paid' => $registration->pretty_paid(), |
1526 | - 'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ), |
|
1526 | + 'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()), |
|
1527 | 1527 | ); |
1528 | 1528 | } |
1529 | 1529 | } |
@@ -1543,30 +1543,30 @@ discard block |
||
1543 | 1543 | * @access protected |
1544 | 1544 | * @param \EE_Payment | null $payment |
1545 | 1545 | */ |
1546 | - protected function _maybe_send_notifications( $payment = null ) { |
|
1547 | - switch ( $payment instanceof EE_Payment ) { |
|
1546 | + protected function _maybe_send_notifications($payment = null) { |
|
1547 | + switch ($payment instanceof EE_Payment) { |
|
1548 | 1548 | // payment notifications |
1549 | 1549 | case true : |
1550 | 1550 | if ( |
1551 | 1551 | isset( |
1552 | - $this->_req_data[ 'txn_payments' ], |
|
1553 | - $this->_req_data[ 'txn_payments' ][ 'send_notifications' ] |
|
1552 | + $this->_req_data['txn_payments'], |
|
1553 | + $this->_req_data['txn_payments']['send_notifications'] |
|
1554 | 1554 | ) && |
1555 | - filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1555 | + filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1556 | 1556 | ) { |
1557 | - $this->_process_payment_notification( $payment ); |
|
1557 | + $this->_process_payment_notification($payment); |
|
1558 | 1558 | } |
1559 | 1559 | break; |
1560 | 1560 | // registration notifications |
1561 | 1561 | case false : |
1562 | 1562 | if ( |
1563 | 1563 | isset( |
1564 | - $this->_req_data[ 'txn_reg_status_change' ], |
|
1565 | - $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] |
|
1564 | + $this->_req_data['txn_reg_status_change'], |
|
1565 | + $this->_req_data['txn_reg_status_change']['send_notifications'] |
|
1566 | 1566 | ) && |
1567 | - filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1567 | + filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1568 | 1568 | ) { |
1569 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' ); |
|
1569 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true'); |
|
1570 | 1570 | } |
1571 | 1571 | break; |
1572 | 1572 | } |
@@ -1582,11 +1582,11 @@ discard block |
||
1582 | 1582 | * @return void |
1583 | 1583 | */ |
1584 | 1584 | protected function _send_payment_reminder() { |
1585 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1586 | - $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
|
1587 | - $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
|
1588 | - do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
|
1589 | - $this->_redirect_after_action( FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE ); |
|
1585 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
1586 | + $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID); |
|
1587 | + $query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array(); |
|
1588 | + do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction); |
|
1589 | + $this->_redirect_after_action(FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE); |
|
1590 | 1590 | } |
1591 | 1591 | |
1592 | 1592 | |
@@ -1600,36 +1600,36 @@ discard block |
||
1600 | 1600 | * @param string $view |
1601 | 1601 | * @return mixed int = count || array of transaction objects |
1602 | 1602 | */ |
1603 | - public function get_transactions( $perpage, $count = FALSE, $view = '' ) { |
|
1603 | + public function get_transactions($perpage, $count = FALSE, $view = '') { |
|
1604 | 1604 | |
1605 | 1605 | $TXN = EEM_Transaction::instance(); |
1606 | 1606 | |
1607 | - $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1608 | - $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1607 | + $start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year')); |
|
1608 | + $end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y'); |
|
1609 | 1609 | |
1610 | 1610 | //make sure our timestamps start and end right at the boundaries for each day |
1611 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1612 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1611 | + $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00'; |
|
1612 | + $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59'; |
|
1613 | 1613 | |
1614 | 1614 | |
1615 | 1615 | //convert to timestamps |
1616 | - $start_date = strtotime( $start_date ); |
|
1617 | - $end_date = strtotime( $end_date ); |
|
1616 | + $start_date = strtotime($start_date); |
|
1617 | + $end_date = strtotime($end_date); |
|
1618 | 1618 | |
1619 | 1619 | //makes sure start date is the lowest value and vice versa |
1620 | - $start_date = min( $start_date, $end_date ); |
|
1621 | - $end_date = max( $start_date, $end_date ); |
|
1620 | + $start_date = min($start_date, $end_date); |
|
1621 | + $end_date = max($start_date, $end_date); |
|
1622 | 1622 | |
1623 | 1623 | //convert to correct format for query |
1624 | - $start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' ); |
|
1625 | - $end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' ); |
|
1624 | + $start_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s'); |
|
1625 | + $end_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s'); |
|
1626 | 1626 | |
1627 | 1627 | |
1628 | 1628 | |
1629 | 1629 | //set orderby |
1630 | 1630 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1631 | 1631 | |
1632 | - switch ( $this->_req_data['orderby'] ) { |
|
1632 | + switch ($this->_req_data['orderby']) { |
|
1633 | 1633 | case 'TXN_ID': |
1634 | 1634 | $orderby = 'TXN_ID'; |
1635 | 1635 | break; |
@@ -1643,66 +1643,66 @@ discard block |
||
1643 | 1643 | $orderby = 'TXN_timestamp'; |
1644 | 1644 | } |
1645 | 1645 | |
1646 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC'; |
|
1647 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
1648 | - $per_page = isset( $perpage ) && !empty( $perpage ) ? $perpage : 10; |
|
1649 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
1646 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC'; |
|
1647 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
1648 | + $per_page = isset($perpage) && ! empty($perpage) ? $perpage : 10; |
|
1649 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
1650 | 1650 | |
1651 | - $offset = ($current_page-1)*$per_page; |
|
1652 | - $limit = array( $offset, $per_page ); |
|
1651 | + $offset = ($current_page - 1) * $per_page; |
|
1652 | + $limit = array($offset, $per_page); |
|
1653 | 1653 | |
1654 | 1654 | $_where = array( |
1655 | - 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ), |
|
1655 | + 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)), |
|
1656 | 1656 | 'Registration.REG_count' => 1 |
1657 | 1657 | ); |
1658 | 1658 | |
1659 | - if ( isset( $this->_req_data['EVT_ID'] ) ) { |
|
1659 | + if (isset($this->_req_data['EVT_ID'])) { |
|
1660 | 1660 | $_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID']; |
1661 | 1661 | } |
1662 | 1662 | |
1663 | - if ( isset( $this->_req_data['s'] ) ) { |
|
1664 | - $search_string = '%' . $this->_req_data['s'] . '%'; |
|
1663 | + if (isset($this->_req_data['s'])) { |
|
1664 | + $search_string = '%'.$this->_req_data['s'].'%'; |
|
1665 | 1665 | $_where['OR'] = array( |
1666 | - 'Registration.Event.EVT_name' => array( 'LIKE', $search_string ), |
|
1667 | - 'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ), |
|
1668 | - 'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ), |
|
1669 | - 'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ), |
|
1670 | - 'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ), |
|
1671 | - 'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ), |
|
1672 | - 'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ), |
|
1673 | - 'Registration.Attendee.ATT_email' => array('LIKE', $search_string ), |
|
1674 | - 'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ), |
|
1675 | - 'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ), |
|
1676 | - 'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ), |
|
1677 | - 'Registration.REG_final_price' => array( 'LIKE', $search_string ), |
|
1678 | - 'Registration.REG_code' => array( 'LIKE', $search_string ), |
|
1679 | - 'Registration.REG_count' => array( 'LIKE' , $search_string ), |
|
1680 | - 'Registration.REG_group_size' => array( 'LIKE' , $search_string ), |
|
1681 | - 'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ), |
|
1682 | - 'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ), |
|
1683 | - 'Payment.PAY_source' => array('LIKE', $search_string ), |
|
1684 | - 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ), |
|
1685 | - 'TXN_session_data' => array( 'LIKE', $search_string ), |
|
1686 | - 'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string ) |
|
1666 | + 'Registration.Event.EVT_name' => array('LIKE', $search_string), |
|
1667 | + 'Registration.Event.EVT_desc' => array('LIKE', $search_string), |
|
1668 | + 'Registration.Event.EVT_short_desc' => array('LIKE', $search_string), |
|
1669 | + 'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string), |
|
1670 | + 'Registration.Attendee.ATT_fname' => array('LIKE', $search_string), |
|
1671 | + 'Registration.Attendee.ATT_lname' => array('LIKE', $search_string), |
|
1672 | + 'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string), |
|
1673 | + 'Registration.Attendee.ATT_email' => array('LIKE', $search_string), |
|
1674 | + 'Registration.Attendee.ATT_address' => array('LIKE', $search_string), |
|
1675 | + 'Registration.Attendee.ATT_address2' => array('LIKE', $search_string), |
|
1676 | + 'Registration.Attendee.ATT_city' => array('LIKE', $search_string), |
|
1677 | + 'Registration.REG_final_price' => array('LIKE', $search_string), |
|
1678 | + 'Registration.REG_code' => array('LIKE', $search_string), |
|
1679 | + 'Registration.REG_count' => array('LIKE', $search_string), |
|
1680 | + 'Registration.REG_group_size' => array('LIKE', $search_string), |
|
1681 | + 'Registration.Ticket.TKT_name' => array('LIKE', $search_string), |
|
1682 | + 'Registration.Ticket.TKT_description' => array('LIKE', $search_string), |
|
1683 | + 'Payment.PAY_source' => array('LIKE', $search_string), |
|
1684 | + 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string), |
|
1685 | + 'TXN_session_data' => array('LIKE', $search_string), |
|
1686 | + 'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string) |
|
1687 | 1687 | ); |
1688 | 1688 | } |
1689 | 1689 | |
1690 | 1690 | //failed transactions |
1691 | - $failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE; |
|
1692 | - $abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE; |
|
1691 | + $failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE : FALSE; |
|
1692 | + $abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE : FALSE; |
|
1693 | 1693 | |
1694 | - if ( $failed ) { |
|
1695 | - $_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code; |
|
1696 | - } else if ( $abandoned ) { |
|
1694 | + if ($failed) { |
|
1695 | + $_where['STS_ID'] = EEM_Transaction::failed_status_code; |
|
1696 | + } else if ($abandoned) { |
|
1697 | 1697 | $_where['STS_ID'] = EEM_Transaction::abandoned_status_code; |
1698 | 1698 | } else { |
1699 | - $_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code ); |
|
1700 | - $_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code ); |
|
1699 | + $_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code); |
|
1700 | + $_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code); |
|
1701 | 1701 | } |
1702 | 1702 | |
1703 | - $query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit ); |
|
1703 | + $query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit); |
|
1704 | 1704 | |
1705 | - $transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params); |
|
1705 | + $transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params); |
|
1706 | 1706 | |
1707 | 1707 | |
1708 | 1708 | return $transactions; |