@@ -109,7 +109,7 @@ |
||
109 | 109 | * - registers and enqueues the qtip scripts and styles. |
110 | 110 | * |
111 | 111 | * @access public |
112 | - * @param array $paths Array of paths to check for the EE_Qtip class. If present we check these path(s) first. If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded. |
|
112 | + * @param string[] $paths Array of paths to check for the EE_Qtip class. If present we check these path(s) first. If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded. |
|
113 | 113 | * @param string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips] |
114 | 114 | * @return void |
115 | 115 | */ |
@@ -81,8 +81,9 @@ discard block |
||
81 | 81 | foreach ( $this->_qtips as $qtip ) { |
82 | 82 | $qts = $qtip->get_tips(); |
83 | 83 | foreach ( $qts as $qt ) { |
84 | - if ( ! $qt instanceof EE_Qtip ) |
|
85 | - continue; |
|
84 | + if ( ! $qt instanceof EE_Qtip ) { |
|
85 | + continue; |
|
86 | + } |
|
86 | 87 | $qtips[] = array( |
87 | 88 | 'content_id' => $qt->content_id, |
88 | 89 | 'options' => $qt->options, |
@@ -90,8 +91,9 @@ discard block |
||
90 | 91 | ); |
91 | 92 | } |
92 | 93 | } |
93 | - if ( !empty($qtips) ) |
|
94 | - wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) ); |
|
94 | + if ( !empty($qtips) ) { |
|
95 | + wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) ); |
|
96 | + } |
|
95 | 97 | |
96 | 98 | } else { |
97 | 99 | //qtips has been requested without any registration (so assuming its just directly used in the admin). |
@@ -171,16 +173,18 @@ discard block |
||
171 | 173 | } |
172 | 174 | |
173 | 175 | //now we attempt a class_exists one more time. |
174 | - if ( !class_exists( $config ) ) |
|
175 | - throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) ); |
|
176 | + if ( !class_exists( $config ) ) { |
|
177 | + throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) ); |
|
178 | + } |
|
176 | 179 | |
177 | 180 | //made it HERE? FINALLY, let's get things setup. |
178 | 181 | $a = new ReflectionClass($config); |
179 | 182 | $qtip = $a->newInstance(); |
180 | 183 | |
181 | 184 | //verify that $qtip is a valid object |
182 | - if ( ! $qtip instanceof EE_Qtip_Config ) |
|
183 | - throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) ); |
|
185 | + if ( ! $qtip instanceof EE_Qtip_Config ) { |
|
186 | + throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) ); |
|
187 | + } |
|
184 | 188 | |
185 | 189 | $this->_qtips[] = $a->newInstance(); |
186 | 190 | |
@@ -196,8 +200,10 @@ discard block |
||
196 | 200 | * @return void |
197 | 201 | */ |
198 | 202 | public function setup_qtip() { |
199 | - if ( empty( $this->_qtips ) ) |
|
200 | - return; //no qtips! |
|
203 | + if ( empty( $this->_qtips ) ) { |
|
204 | + return; |
|
205 | + } |
|
206 | + //no qtips! |
|
201 | 207 | |
202 | 208 | $content = array(); |
203 | 209 | |
@@ -219,8 +225,9 @@ discard block |
||
219 | 225 | $qts = $qtip->get_tips(); |
220 | 226 | $content = array(); |
221 | 227 | foreach ( $qts as $qt ) { |
222 | - if ( ! $qt instanceof EE_Qtip ) |
|
223 | - continue; |
|
228 | + if ( ! $qt instanceof EE_Qtip ) { |
|
229 | + continue; |
|
230 | + } |
|
224 | 231 | $content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>'; |
225 | 232 | } |
226 | 233 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public static function instance() { |
34 | 34 | // check if class object is instantiated |
35 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) { |
|
35 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EEH_Qtip_Loader)) { |
|
36 | 36 | self::$_instance = new self(); |
37 | 37 | } |
38 | 38 | return self::$_instance; |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | */ |
49 | 49 | private function __construct() { |
50 | 50 | //let's just make sure this is instantiated in the right place. |
51 | - if ( did_action( 'wp_print_styles' ) || did_action( 'admin_head' )) { |
|
52 | - EE_Error::doing_it_wrong( 'EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso' ), '4.1' ); |
|
51 | + if (did_action('wp_print_styles') || did_action('admin_head')) { |
|
52 | + EE_Error::doing_it_wrong('EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1'); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
@@ -61,25 +61,25 @@ discard block |
||
61 | 61 | * @return void |
62 | 62 | */ |
63 | 63 | public function register_and_enqueue() { |
64 | - $qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js'; |
|
65 | - $qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map'; |
|
66 | - $qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css'; |
|
64 | + $qtips_js = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.js'; |
|
65 | + $qtip_map = EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.map'; |
|
66 | + $qtipcss = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.css'; |
|
67 | 67 | |
68 | - wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE ); |
|
69 | - wp_register_script('qtip', $qtips_js, array('jquery'), '3.0.3', TRUE ); |
|
70 | - wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
68 | + wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE); |
|
69 | + wp_register_script('qtip', $qtips_js, array('jquery'), '3.0.3', TRUE); |
|
70 | + wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS.'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE); |
|
71 | 71 | |
72 | - wp_register_style('qtip-css', $qtipcss, array(), '2.2' ); |
|
72 | + wp_register_style('qtip-css', $qtipcss, array(), '2.2'); |
|
73 | 73 | |
74 | 74 | //k now let's see if there are any registered qtips. If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!) |
75 | - if ( !empty( $this->_qtips ) ) { |
|
75 | + if ( ! empty($this->_qtips)) { |
|
76 | 76 | wp_enqueue_script('ee-qtip-helper'); |
77 | 77 | wp_enqueue_style('qtip-css'); |
78 | 78 | $qtips = array(); |
79 | - foreach ( $this->_qtips as $qtip ) { |
|
79 | + foreach ($this->_qtips as $qtip) { |
|
80 | 80 | $qts = $qtip->get_tips(); |
81 | - foreach ( $qts as $qt ) { |
|
82 | - if ( ! $qt instanceof EE_Qtip ) |
|
81 | + foreach ($qts as $qt) { |
|
82 | + if ( ! $qt instanceof EE_Qtip) |
|
83 | 83 | continue; |
84 | 84 | $qtips[] = array( |
85 | 85 | 'content_id' => $qt->content_id, |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | ); |
89 | 89 | } |
90 | 90 | } |
91 | - if ( !empty($qtips) ) |
|
92 | - wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) ); |
|
91 | + if ( ! empty($qtips)) |
|
92 | + wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array('qtips' => $qtips)); |
|
93 | 93 | |
94 | 94 | } else { |
95 | 95 | //qtips has been requested without any registration (so assuming its just directly used in the admin). |
@@ -111,24 +111,24 @@ discard block |
||
111 | 111 | * @param string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips] |
112 | 112 | * @return void |
113 | 113 | */ |
114 | - public function register( $configname, $paths = array() ) { |
|
114 | + public function register($configname, $paths = array()) { |
|
115 | 115 | |
116 | 116 | //let's just make sure this is instantiated in the right place. |
117 | - if ( did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts') ) { |
|
118 | - EE_Error::doing_it_wrong( 'EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso' ), '4.1' ); |
|
117 | + if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) { |
|
118 | + EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1'); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | $configname = (array) $configname; //typecast to array |
122 | - foreach ( $configname as $config ) { |
|
123 | - $this->_register( $config, $paths ); |
|
122 | + foreach ($configname as $config) { |
|
123 | + $this->_register($config, $paths); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | //hook into appropriate footer |
127 | 127 | $footer_action = is_admin() ? 'admin_footer' : 'wp_footer'; |
128 | - add_action($footer_action, array($this, 'setup_qtip'), 10 ); |
|
128 | + add_action($footer_action, array($this, 'setup_qtip'), 10); |
|
129 | 129 | |
130 | 130 | //make sure we "turn on" qtip js. |
131 | - add_filter('FHEE_load_qtip', '__return_true' ); |
|
131 | + add_filter('FHEE_load_qtip', '__return_true'); |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | |
@@ -142,15 +142,15 @@ discard block |
||
142 | 142 | * @throws EE_Error |
143 | 143 | * @return void |
144 | 144 | */ |
145 | - private function _register( $config, $paths ) { |
|
145 | + private function _register($config, $paths) { |
|
146 | 146 | //before doing anything we have to make sure that EE_Qtip_Config parent is required. |
147 | - EE_Registry::instance()->load_lib( 'Qtip_Config', array(), TRUE ); |
|
147 | + EE_Registry::instance()->load_lib('Qtip_Config', array(), TRUE); |
|
148 | 148 | |
149 | - if ( !empty( $paths ) ) { |
|
149 | + if ( ! empty($paths)) { |
|
150 | 150 | $paths = (array) $paths; |
151 | - foreach ( $paths as $path ) { |
|
152 | - $path = $path . $config . '.lib.php'; |
|
153 | - if ( !is_readable($path ) ) { |
|
151 | + foreach ($paths as $path) { |
|
152 | + $path = $path.$config.'.lib.php'; |
|
153 | + if ( ! is_readable($path)) { |
|
154 | 154 | continue; |
155 | 155 | } else { |
156 | 156 | require_once $path; |
@@ -159,26 +159,26 @@ discard block |
||
159 | 159 | } |
160 | 160 | |
161 | 161 | //does class exist at this point? If it does then let's instantiate. If it doesn't then let's continue with other paths. |
162 | - if ( !class_exists($config) ) { |
|
163 | - $path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php'; |
|
164 | - if ( !is_readable($path ) ) { |
|
165 | - throw new EE_Error( sprintf( __('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable. Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config ) ); |
|
162 | + if ( ! class_exists($config)) { |
|
163 | + $path = EE_LIBRARIES.'qtips/'.$config.'.lib.php'; |
|
164 | + if ( ! is_readable($path)) { |
|
165 | + throw new EE_Error(sprintf(__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable. Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config)); |
|
166 | 166 | } else { |
167 | 167 | require_once $path; |
168 | 168 | } |
169 | 169 | } |
170 | 170 | |
171 | 171 | //now we attempt a class_exists one more time. |
172 | - if ( !class_exists( $config ) ) |
|
173 | - throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) ); |
|
172 | + if ( ! class_exists($config)) |
|
173 | + throw new EE_Error(sprintf(__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config)); |
|
174 | 174 | |
175 | 175 | //made it HERE? FINALLY, let's get things setup. |
176 | 176 | $a = new ReflectionClass($config); |
177 | 177 | $qtip = $a->newInstance(); |
178 | 178 | |
179 | 179 | //verify that $qtip is a valid object |
180 | - if ( ! $qtip instanceof EE_Qtip_Config ) |
|
181 | - throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) ); |
|
180 | + if ( ! $qtip instanceof EE_Qtip_Config) |
|
181 | + throw new EE_Error(sprintf(esc_html__('The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>')); |
|
182 | 182 | |
183 | 183 | $this->_qtips[] = $a->newInstance(); |
184 | 184 | |
@@ -194,12 +194,12 @@ discard block |
||
194 | 194 | * @return void |
195 | 195 | */ |
196 | 196 | public function setup_qtip() { |
197 | - if ( empty( $this->_qtips ) ) |
|
197 | + if (empty($this->_qtips)) |
|
198 | 198 | return; //no qtips! |
199 | 199 | |
200 | 200 | $content = array(); |
201 | 201 | |
202 | - foreach ( $this->_qtips as $qtip ) { |
|
202 | + foreach ($this->_qtips as $qtip) { |
|
203 | 203 | $content[] = $this->_generate_content_container($qtip); |
204 | 204 | } |
205 | 205 | |
@@ -216,10 +216,10 @@ discard block |
||
216 | 216 | private function _generate_content_container($qtip) { |
217 | 217 | $qts = $qtip->get_tips(); |
218 | 218 | $content = array(); |
219 | - foreach ( $qts as $qt ) { |
|
220 | - if ( ! $qt instanceof EE_Qtip ) |
|
219 | + foreach ($qts as $qt) { |
|
220 | + if ( ! $qt instanceof EE_Qtip) |
|
221 | 221 | continue; |
222 | - $content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>'; |
|
222 | + $content[] = '<div class="ee-qtip-helper-content hidden" id="'.$qt->content_id.'">'.$qt->content.'</div>'; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | return implode('<br />', $content); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | /** |
132 | 132 | * For verifying that a variable is indeed an array, else throw an EE_Error |
133 | 133 | * @param type $variable_to_test |
134 | - * @param type $variable_name |
|
134 | + * @param string $variable_name |
|
135 | 135 | * @param type $allow_empty one of 'allow_empty' or 'do_not_allow_empty' |
136 | 136 | * @return void |
137 | 137 | * @throws EE_Error |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * for verifying that a variable is one of the string optiosn supplied |
160 | 160 | * @param mixed $variable_to_test |
161 | 161 | * @param mixed $variable_name the name you've given the variable. Eg, '$foo'. THis helps in producing better error messages |
162 | - * @param array $string_options an array of acceptable values |
|
162 | + * @param string[] $string_options an array of acceptable values |
|
163 | 163 | * @return void |
164 | 164 | * @throws EE_Error |
165 | 165 | */ |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | * @return void |
51 | 51 | * @throws EE_Error (indirectly) |
52 | 52 | */ |
53 | - static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){ |
|
54 | - if(!WP_DEBUG)return; |
|
55 | - self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
|
56 | - if('allow_null' == $allow_null && is_null($variable_to_test)){ |
|
53 | + static function verify_is_array_of($variable_to_test, $name_of_variable, $class_name, $allow_null = 'allow_null') { |
|
54 | + if ( ! WP_DEBUG)return; |
|
55 | + self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null')); |
|
56 | + if ('allow_null' == $allow_null && is_null($variable_to_test)) { |
|
57 | 57 | return; |
58 | 58 | } |
59 | 59 | self::verify_is_array($variable_to_test, $name_of_variable); |
60 | - foreach($variable_to_test as $key=>$array_element){ |
|
60 | + foreach ($variable_to_test as $key=>$array_element) { |
|
61 | 61 | self::verify_instanceof($array_element, $key, $class_name); |
62 | 62 | } |
63 | 63 | } |
@@ -73,12 +73,12 @@ discard block |
||
73 | 73 | * @return void |
74 | 74 | * @throws EE_Error |
75 | 75 | */ |
76 | - static function verify_isnt_null($variable_to_test,$name_of_variable){ |
|
77 | - if(!WP_DEBUG)return; |
|
78 | - if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){ |
|
79 | - $error[]=__('Variable named %s is null.','event_espresso'); |
|
80 | - $error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso'); |
|
81 | - throw new EE_Error(sprintf(implode(",",$error),$name_of_variable,$name_of_variable)); |
|
76 | + static function verify_isnt_null($variable_to_test, $name_of_variable) { |
|
77 | + if ( ! WP_DEBUG)return; |
|
78 | + if ($variable_to_test == null && $variable_to_test != 0 && $variable_to_test != FALSE) { |
|
79 | + $error[] = __('Variable named %s is null.', 'event_espresso'); |
|
80 | + $error[] = __("Consider looking at the stack trace to see why it wasn't set.", 'event_espresso'); |
|
81 | + throw new EE_Error(sprintf(implode(",", $error), $name_of_variable, $name_of_variable)); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | * @return void |
91 | 91 | * @throws EE_Error |
92 | 92 | */ |
93 | - static function verify_is_true($expression_to_test,$expression_string_representation){ |
|
94 | - if(!WP_DEBUG)return; |
|
95 | - if(!$expression_to_test){ |
|
96 | - $error[]=__('Template error.','event_espresso'); |
|
97 | - $error[]=__("%s evaluated to false, but it must be true!",'event_espresso'); |
|
98 | - throw new EE_Error(sprintf(implode(",",$error),$expression_string_representation)); |
|
93 | + static function verify_is_true($expression_to_test, $expression_string_representation) { |
|
94 | + if ( ! WP_DEBUG)return; |
|
95 | + if ( ! $expression_to_test) { |
|
96 | + $error[] = __('Template error.', 'event_espresso'); |
|
97 | + $error[] = __("%s evaluated to false, but it must be true!", 'event_espresso'); |
|
98 | + throw new EE_Error(sprintf(implode(",", $error), $expression_string_representation)); |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
@@ -111,16 +111,16 @@ discard block |
||
111 | 111 | * @return void |
112 | 112 | * @throws EE_Error |
113 | 113 | */ |
114 | - static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){ |
|
115 | - if(!WP_DEBUG)return; |
|
116 | - self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
|
117 | - if($allow_null == 'allow_null' && is_null($variable_to_test)){ |
|
114 | + static function verify_instanceof($variable_to_test, $name_of_variable, $class_name, $allow_null = 'do_not_allow_null') { |
|
115 | + if ( ! WP_DEBUG)return; |
|
116 | + self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null')); |
|
117 | + if ($allow_null == 'allow_null' && is_null($variable_to_test)) { |
|
118 | 118 | return; |
119 | 119 | } |
120 | - if( $variable_to_test == NULL || ! ( $variable_to_test instanceof $class_name )){ |
|
121 | - $msg[]=__('Variable %s is not of the correct type.','event_espresso'); |
|
122 | - $msg[]=__("It should be of type %s",'event_espresso'); |
|
123 | - throw new EE_Error(sprintf(implode(",",$msg),$name_of_variable,$name_of_variable,$class_name)); |
|
120 | + if ($variable_to_test == NULL || ! ($variable_to_test instanceof $class_name)) { |
|
121 | + $msg[] = __('Variable %s is not of the correct type.', 'event_espresso'); |
|
122 | + $msg[] = __("It should be of type %s", 'event_espresso'); |
|
123 | + throw new EE_Error(sprintf(implode(",", $msg), $name_of_variable, $name_of_variable, $class_name)); |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
@@ -136,16 +136,16 @@ discard block |
||
136 | 136 | * @return void |
137 | 137 | * @throws EE_Error |
138 | 138 | */ |
139 | - static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){ |
|
140 | - if(!WP_DEBUG)return; |
|
141 | - self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty')); |
|
142 | - if(empty($variable_to_test) && 'allow_empty'==$allow_empty){ |
|
139 | + static function verify_is_array($variable_to_test, $variable_name, $allow_empty = 'allow_empty') { |
|
140 | + if ( ! WP_DEBUG)return; |
|
141 | + self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty', 'do_not_allow_empty')); |
|
142 | + if (empty($variable_to_test) && 'allow_empty' == $allow_empty) { |
|
143 | 143 | return; |
144 | 144 | } |
145 | - if(!is_array($variable_to_test)){ |
|
146 | - $error[]=__('Variable %s should be an array, but it is not.'); |
|
147 | - $error[]=__("Its value is, instead '%s'",'event_espresso'); |
|
148 | - throw new EE_Error(sprintf(implode(",",$error),$variable_name,$variable_name,$variable_to_test)); |
|
145 | + if ( ! is_array($variable_to_test)) { |
|
146 | + $error[] = __('Variable %s should be an array, but it is not.'); |
|
147 | + $error[] = __("Its value is, instead '%s'", 'event_espresso'); |
|
148 | + throw new EE_Error(sprintf(implode(",", $error), $variable_name, $variable_name, $variable_to_test)); |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
@@ -163,12 +163,12 @@ discard block |
||
163 | 163 | * @return void |
164 | 164 | * @throws EE_Error |
165 | 165 | */ |
166 | - static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){ |
|
167 | - if(!WP_DEBUG)return; |
|
168 | - if(!in_array($variable_to_test,$string_options)){ |
|
169 | - $msg[0]=__('Malconfigured template.','event_espresso'); |
|
170 | - $msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso'); |
|
171 | - throw new EE_Error(sprintf(implode("||",$msg),$variable_name,$variable_to_test, implode("', '",$string_options))); |
|
166 | + static function verify_argument_is_one_of($variable_to_test, $variable_name, $string_options) { |
|
167 | + if ( ! WP_DEBUG)return; |
|
168 | + if ( ! in_array($variable_to_test, $string_options)) { |
|
169 | + $msg[0] = __('Malconfigured template.', 'event_espresso'); |
|
170 | + $msg[1] = __("Variable named '%s' was set to '%s'. It can only be one of '%s'", 'event_espresso'); |
|
171 | + throw new EE_Error(sprintf(implode("||", $msg), $variable_name, $variable_to_test, implode("', '", $string_options))); |
|
172 | 172 | } |
173 | 173 | } |
174 | 174 |
@@ -1,4 +1,6 @@ discard block |
||
1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | +} |
|
2 | 4 | |
3 | 5 | /** |
4 | 6 | * Event Espresso |
@@ -51,7 +53,9 @@ discard block |
||
51 | 53 | * @throws EE_Error (indirectly) |
52 | 54 | */ |
53 | 55 | static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){ |
54 | - if(!WP_DEBUG)return; |
|
56 | + if(!WP_DEBUG) { |
|
57 | + return; |
|
58 | + } |
|
55 | 59 | self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
56 | 60 | if('allow_null' == $allow_null && is_null($variable_to_test)){ |
57 | 61 | return; |
@@ -74,7 +78,9 @@ discard block |
||
74 | 78 | * @throws EE_Error |
75 | 79 | */ |
76 | 80 | static function verify_isnt_null($variable_to_test,$name_of_variable){ |
77 | - if(!WP_DEBUG)return; |
|
81 | + if(!WP_DEBUG) { |
|
82 | + return; |
|
83 | + } |
|
78 | 84 | if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){ |
79 | 85 | $error[]=__('Variable named %s is null.','event_espresso'); |
80 | 86 | $error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso'); |
@@ -91,7 +97,9 @@ discard block |
||
91 | 97 | * @throws EE_Error |
92 | 98 | */ |
93 | 99 | static function verify_is_true($expression_to_test,$expression_string_representation){ |
94 | - if(!WP_DEBUG)return; |
|
100 | + if(!WP_DEBUG) { |
|
101 | + return; |
|
102 | + } |
|
95 | 103 | if(!$expression_to_test){ |
96 | 104 | $error[]=__('Template error.','event_espresso'); |
97 | 105 | $error[]=__("%s evaluated to false, but it must be true!",'event_espresso'); |
@@ -112,7 +120,9 @@ discard block |
||
112 | 120 | * @throws EE_Error |
113 | 121 | */ |
114 | 122 | static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){ |
115 | - if(!WP_DEBUG)return; |
|
123 | + if(!WP_DEBUG) { |
|
124 | + return; |
|
125 | + } |
|
116 | 126 | self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null')); |
117 | 127 | if($allow_null == 'allow_null' && is_null($variable_to_test)){ |
118 | 128 | return; |
@@ -137,7 +147,9 @@ discard block |
||
137 | 147 | * @throws EE_Error |
138 | 148 | */ |
139 | 149 | static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){ |
140 | - if(!WP_DEBUG)return; |
|
150 | + if(!WP_DEBUG) { |
|
151 | + return; |
|
152 | + } |
|
141 | 153 | self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty')); |
142 | 154 | if(empty($variable_to_test) && 'allow_empty'==$allow_empty){ |
143 | 155 | return; |
@@ -164,7 +176,9 @@ discard block |
||
164 | 176 | * @throws EE_Error |
165 | 177 | */ |
166 | 178 | static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){ |
167 | - if(!WP_DEBUG)return; |
|
179 | + if(!WP_DEBUG) { |
|
180 | + return; |
|
181 | + } |
|
168 | 182 | if(!in_array($variable_to_test,$string_options)){ |
169 | 183 | $msg[0]=__('Malconfigured template.','event_espresso'); |
170 | 184 | $msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso'); |
@@ -25,7 +25,7 @@ |
||
25 | 25 | /** |
26 | 26 | * |
27 | 27 | * @param $normalized_value |
28 | - * @return bool |
|
28 | + * @return boolean|null |
|
29 | 29 | */ |
30 | 30 | function validate($normalized_value) { |
31 | 31 | //errors should have been detected by the normalization strategy |
@@ -8,16 +8,16 @@ discard block |
||
8 | 8 | * @since 4.6 |
9 | 9 | * |
10 | 10 | */ |
11 | -class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
11 | +class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param null $validation_error_message |
15 | 15 | */ |
16 | - public function __construct( $validation_error_message = NULL ) { |
|
17 | - if( ! $validation_error_message ){ |
|
16 | + public function __construct($validation_error_message = NULL) { |
|
17 | + if ( ! $validation_error_message) { |
|
18 | 18 | $validation_error_message = sprintf(__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso")); |
19 | 19 | } |
20 | - parent::__construct( $validation_error_message ); |
|
20 | + parent::__construct($validation_error_message); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | /** |
37 | 37 | * @return array |
38 | 38 | */ |
39 | - function get_jquery_validation_rule_array(){ |
|
40 | - return array('number'=>true, 'messages' => array( 'number' => $this->get_validation_error_message() ) ); |
|
39 | + function get_jquery_validation_rule_array() { |
|
40 | + return array('number'=>true, 'messages' => array('number' => $this->get_validation_error_message())); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * just checks the field isn't blank |
27 | 27 | * |
28 | 28 | * @param $normalized_value |
29 | - * @return bool |
|
29 | + * @return boolean|null |
|
30 | 30 | * @throws \EE_Validation_Error |
31 | 31 | */ |
32 | 32 | function validate($normalized_value) { |
@@ -8,16 +8,16 @@ discard block |
||
8 | 8 | * @since 4.6 |
9 | 9 | * |
10 | 10 | */ |
11 | -class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
11 | +class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param null $validation_error_message |
15 | 15 | */ |
16 | - public function __construct( $validation_error_message = NULL ) { |
|
17 | - if( ! $validation_error_message ){ |
|
16 | + public function __construct($validation_error_message = NULL) { |
|
17 | + if ( ! $validation_error_message) { |
|
18 | 18 | $validation_error_message = __("Please enter a valid URL. Eg https://eventespresso.com", "event_espresso"); |
19 | 19 | } |
20 | - parent::__construct( $validation_error_message ); |
|
20 | + parent::__construct($validation_error_message); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -30,16 +30,16 @@ discard block |
||
30 | 30 | * @throws \EE_Validation_Error |
31 | 31 | */ |
32 | 32 | function validate($normalized_value) { |
33 | - if( $normalized_value ){ |
|
34 | - if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){ |
|
35 | - throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url'); |
|
36 | - }else{ |
|
37 | - if( ! EEH_URL::remote_file_exists( |
|
33 | + if ($normalized_value) { |
|
34 | + if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false) { |
|
35 | + throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url'); |
|
36 | + } else { |
|
37 | + if ( ! EEH_URL::remote_file_exists( |
|
38 | 38 | $normalized_value, |
39 | 39 | array( |
40 | 40 | 'sslverify' => false, |
41 | - 'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
42 | - ))){ |
|
41 | + 'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
42 | + ))) { |
|
43 | 43 | throw new EE_Validation_Error(sprintf(__("That URL seems to be broken. Please enter a valid URL", "event_espresso"))); |
44 | 44 | } |
45 | 45 | } |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | /** |
52 | 52 | * @return array |
53 | 53 | */ |
54 | - function get_jquery_validation_rule_array(){ |
|
55 | - return array( 'validUrl'=>true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) ); |
|
54 | + function get_jquery_validation_rule_array() { |
|
55 | + return array('validUrl'=>true, 'messages' => array('validUrl' => $this->get_validation_error_message())); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | if( $normalized_value ){ |
34 | 34 | if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){ |
35 | 35 | throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url'); |
36 | - }else{ |
|
36 | + } else{ |
|
37 | 37 | if( ! EEH_URL::remote_file_exists( |
38 | 38 | $normalized_value, |
39 | 39 | array( |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * This is used to output a single |
48 | 48 | * @param EE_Line_Item $line_item |
49 | 49 | * @param array $options |
50 | - * @return mixed |
|
50 | + * @return string |
|
51 | 51 | */ |
52 | 52 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
53 | 53 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | * |
164 | 164 | * @param EE_Line_Item $line_item |
165 | 165 | * @param array $options |
166 | - * @return mixed |
|
166 | + * @return string |
|
167 | 167 | */ |
168 | 168 | protected function _item_row( EE_Line_Item $line_item, $options = array() ) { |
169 | 169 | $line_item_related_object = $line_item->get_object(); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | * |
230 | 230 | * @param EE_Line_Item $line_item |
231 | 231 | * @param array $options |
232 | - * @return mixed |
|
232 | + * @return string |
|
233 | 233 | */ |
234 | 234 | protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
235 | 235 | //for now we're not showing sub-items |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * |
244 | 244 | * @param EE_Line_Item $line_item |
245 | 245 | * @param array $options |
246 | - * @return mixed |
|
246 | + * @return string |
|
247 | 247 | */ |
248 | 248 | protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
249 | 249 | // start of row |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | * @param EE_Line_Item $line_item |
267 | 267 | * @param string $text |
268 | 268 | * @param array $options |
269 | - * @return mixed |
|
269 | + * @return string |
|
270 | 270 | */ |
271 | 271 | protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
272 | 272 | //currently not showing subtotal row |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * |
281 | 281 | * @param EE_Line_Item $line_item |
282 | 282 | * @param array $options |
283 | - * @return mixed |
|
283 | + * @return string |
|
284 | 284 | */ |
285 | 285 | protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
286 | 286 | // start of row |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @param array $options |
50 | 50 | * @return mixed |
51 | 51 | */ |
52 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
52 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
53 | 53 | |
54 | 54 | $html = ''; |
55 | 55 | // set some default options and merge with incoming |
@@ -60,43 +60,43 @@ discard block |
||
60 | 60 | 'taxes_tr_css_class' => 'admin-primary-mbox-taxes-tr', |
61 | 61 | 'total_tr_css_class' => 'admin-primary-mbox-total-tr' |
62 | 62 | ); |
63 | - $options = array_merge( $default_options, (array)$options ); |
|
63 | + $options = array_merge($default_options, (array) $options); |
|
64 | 64 | |
65 | - switch( $line_item->type() ) { |
|
65 | + switch ($line_item->type()) { |
|
66 | 66 | |
67 | 67 | case EEM_Line_Item::type_line_item: |
68 | 68 | // item row |
69 | - $html .= $this->_item_row( $line_item, $options ); |
|
69 | + $html .= $this->_item_row($line_item, $options); |
|
70 | 70 | break; |
71 | 71 | |
72 | 72 | case EEM_Line_Item::type_sub_line_item: |
73 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
73 | + $html .= $this->_sub_item_row($line_item, $options); |
|
74 | 74 | break; |
75 | 75 | |
76 | 76 | case EEM_Line_Item::type_sub_total: |
77 | - if ( $line_item->quantity() === 0 ) { |
|
77 | + if ($line_item->quantity() === 0) { |
|
78 | 78 | return $html; |
79 | 79 | } |
80 | 80 | //loop through children |
81 | 81 | $child_line_items = $line_item->children(); |
82 | 82 | //loop through children |
83 | - foreach ( $child_line_items as $child_line_item ) { |
|
83 | + foreach ($child_line_items as $child_line_item) { |
|
84 | 84 | //recursively feed children back into this method |
85 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
85 | + $html .= $this->display_line_item($child_line_item, $options); |
|
86 | 86 | } |
87 | - $html .= $this->_sub_total_row( $line_item, $options ); |
|
87 | + $html .= $this->_sub_total_row($line_item, $options); |
|
88 | 88 | break; |
89 | 89 | |
90 | 90 | case EEM_Line_Item::type_tax: |
91 | - if ( $this->_show_taxes ) { |
|
92 | - $this->_taxes_html .= $this->_tax_row( $line_item, $options ); |
|
91 | + if ($this->_show_taxes) { |
|
92 | + $this->_taxes_html .= $this->_tax_row($line_item, $options); |
|
93 | 93 | } |
94 | 94 | break; |
95 | 95 | |
96 | 96 | case EEM_Line_Item::type_tax_sub_total: |
97 | - foreach( $line_item->children() as $child_line_item ) { |
|
98 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax ) { |
|
99 | - $this->display_line_item( $child_line_item, $options ); |
|
97 | + foreach ($line_item->children() as $child_line_item) { |
|
98 | + if ($child_line_item->type() == EEM_Line_Item::type_tax) { |
|
99 | + $this->display_line_item($child_line_item, $options); |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 | break; |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | $children = $line_item->children(); |
109 | 109 | |
110 | 110 | // loop thru all non-tax child line items |
111 | - foreach( $children as $child_line_item ) { |
|
112 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
111 | + foreach ($children as $child_line_item) { |
|
112 | + $html .= $this->display_line_item($child_line_item, $options); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | $html .= $this->_taxes_html; |
116 | - $html .= $this->_total_row( $line_item, $options ); |
|
117 | - if ( $options['use_table_wrapper'] ) { |
|
118 | - $html = $this->_table_header( $options ) . $html . $this->_table_footer( $options ); |
|
116 | + $html .= $this->_total_row($line_item, $options); |
|
117 | + if ($options['use_table_wrapper']) { |
|
118 | + $html = $this->_table_header($options).$html.$this->_table_footer($options); |
|
119 | 119 | } |
120 | 120 | break; |
121 | 121 | |
@@ -132,15 +132,15 @@ discard block |
||
132 | 132 | * @param array $options |
133 | 133 | * @return string |
134 | 134 | */ |
135 | - protected function _table_header( $options ) { |
|
136 | - $html = EEH_HTML::table( '','', $options['table_css_class'] ); |
|
135 | + protected function _table_header($options) { |
|
136 | + $html = EEH_HTML::table('', '', $options['table_css_class']); |
|
137 | 137 | $html .= EEH_HTML::thead(); |
138 | 138 | $html .= EEH_HTML::tr(); |
139 | - $html .= EEH_HTML::th( __( 'Name', 'event_espresso' ), '', 'jst-left' ); |
|
140 | - $html .= EEH_HTML::th( __( 'Type', 'event_espresso'), '', 'jst-left' ); |
|
141 | - $html .= EEH_HTML::th( __( 'Amount', 'event_espresso' ), '', 'jst-cntr' ); |
|
142 | - $html .= EEH_HTML::th( __( 'Qty', 'event_espresso' ), '', 'jst-cntr' ); |
|
143 | - $html .= EEH_HTML::th( __( 'Line Total', 'event_espresso'), '', 'jst-cntr' ); |
|
139 | + $html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left'); |
|
140 | + $html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left'); |
|
141 | + $html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr'); |
|
142 | + $html .= EEH_HTML::th(__('Qty', 'event_espresso'), '', 'jst-cntr'); |
|
143 | + $html .= EEH_HTML::th(__('Line Total', 'event_espresso'), '', 'jst-cntr'); |
|
144 | 144 | $html .= EEH_HTML::tbody(); |
145 | 145 | return $html; |
146 | 146 | } |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | * @param array $options array of options for the table. |
153 | 153 | * @return string |
154 | 154 | */ |
155 | - protected function _table_footer( $options ) { |
|
156 | - return EEH_HTML::tbodyx() . EEH_HTML::tablex(); |
|
155 | + protected function _table_footer($options) { |
|
156 | + return EEH_HTML::tbodyx().EEH_HTML::tablex(); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | |
@@ -165,12 +165,12 @@ discard block |
||
165 | 165 | * @param array $options |
166 | 166 | * @return mixed |
167 | 167 | */ |
168 | - protected function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
168 | + protected function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
169 | 169 | $line_item_related_object = $line_item->get_object(); |
170 | 170 | $parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->get_object() : null; |
171 | 171 | // start of row |
172 | 172 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
173 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
173 | + $html = EEH_HTML::tr('', '', $row_class); |
|
174 | 174 | |
175 | 175 | |
176 | 176 | //Name Column |
@@ -178,45 +178,45 @@ discard block |
||
178 | 178 | |
179 | 179 | //related object scope. |
180 | 180 | $parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object ? $parent_line_item_related_object->name() : ''; |
181 | - $parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name; |
|
181 | + $parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name; |
|
182 | 182 | $parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links ? $parent_line_item_related_object->get_admin_details_link() : ''; |
183 | 183 | |
184 | 184 | |
185 | 185 | $name_html = $line_item_related_object instanceof EEI_Line_Item_Object ? $line_item_related_object->name() : $line_item->name(); |
186 | - $name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' : $name_html; |
|
186 | + $name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' : $name_html; |
|
187 | 187 | $name_html .= $line_item->is_taxable() ? ' *' : ''; |
188 | 188 | //maybe preface with icon? |
189 | - $name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon() . $name_html : $name_html; |
|
190 | - $name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>'; |
|
191 | - $name_html .= sprintf( |
|
192 | - _x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
189 | + $name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon().$name_html : $name_html; |
|
190 | + $name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>'; |
|
191 | + $name_html .= sprintf( |
|
192 | + _x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
193 | 193 | '<span class="ee-line-item-related-parent-object">', |
194 | - $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __( 'Item:', 'event_espresso' ), |
|
195 | - $parent_related_object_link ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' : $parent_related_object_name, |
|
194 | + $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __('Item:', 'event_espresso'), |
|
195 | + $parent_related_object_link ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' : $parent_related_object_name, |
|
196 | 196 | '</span>' |
197 | 197 | ); |
198 | - $html .= EEH_HTML::td( $name_html, '', 'jst-left' ); |
|
198 | + $html .= EEH_HTML::td($name_html, '', 'jst-left'); |
|
199 | 199 | //Type Column |
200 | 200 | $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() : ''; |
201 | - $type_html .= $this->_get_cancellations( $line_item ); |
|
201 | + $type_html .= $this->_get_cancellations($line_item); |
|
202 | 202 | $type_html .= $line_item->OBJ_type() ? '<br />' : ''; |
203 | 203 | $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
204 | - $type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : ''; |
|
205 | - $html .= EEH_HTML::td( $type_html, '', 'jst-left' ); |
|
204 | + $type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : ''; |
|
205 | + $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
|
206 | 206 | |
207 | 207 | |
208 | 208 | //Amount Column |
209 | - if ( $line_item->is_percent() ) { |
|
210 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' ); |
|
209 | + if ($line_item->is_percent()) { |
|
210 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght'); |
|
211 | 211 | } else { |
212 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' ); |
|
212 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | //QTY column |
216 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'jst-rght' ); |
|
216 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'jst-rght'); |
|
217 | 217 | |
218 | 218 | //total column |
219 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
219 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
220 | 220 | |
221 | 221 | //finish things off and return |
222 | 222 | $html .= EEH_HTML::trx(); |
@@ -231,12 +231,12 @@ discard block |
||
231 | 231 | * @param EE_Line_Item $line_item |
232 | 232 | * @return string |
233 | 233 | */ |
234 | - protected function _get_cancellations( EE_Line_Item $line_item ) { |
|
234 | + protected function _get_cancellations(EE_Line_Item $line_item) { |
|
235 | 235 | $html = ''; |
236 | 236 | $cancellations = $line_item->get_cancellations(); |
237 | - $cancellation = reset( $cancellations ); |
|
237 | + $cancellation = reset($cancellations); |
|
238 | 238 | // \EEH_Debug_Tools::printr( $cancellation, '$cancellation', __FILE__, __LINE__ ); |
239 | - if ( $cancellation instanceof EE_Line_Item ) { |
|
239 | + if ($cancellation instanceof EE_Line_Item) { |
|
240 | 240 | $html .= ' <span class="ee-line-item-id">'; |
241 | 241 | $html .= sprintf( |
242 | 242 | _n( |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | * @param array $options |
262 | 262 | * @return mixed |
263 | 263 | */ |
264 | - protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
264 | + protected function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
265 | 265 | //for now we're not showing sub-items |
266 | 266 | return ''; |
267 | 267 | } |
@@ -275,13 +275,13 @@ discard block |
||
275 | 275 | * @param array $options |
276 | 276 | * @return mixed |
277 | 277 | */ |
278 | - protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
278 | + protected function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
279 | 279 | // start of row |
280 | - $html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' ); |
|
280 | + $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
|
281 | 281 | // name th |
282 | - $html .= EEH_HTML::th( $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '', 'jst-rght', '', ' colspan="4"' ); |
|
282 | + $html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="4"'); |
|
283 | 283 | // total th |
284 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
284 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
285 | 285 | // end of row |
286 | 286 | $html .= EEH_HTML::trx(); |
287 | 287 | return $html; |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | * @param array $options |
299 | 299 | * @return mixed |
300 | 300 | */ |
301 | - protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
301 | + protected function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
302 | 302 | //currently not showing subtotal row |
303 | 303 | return ''; |
304 | 304 | } |
@@ -312,15 +312,15 @@ discard block |
||
312 | 312 | * @param array $options |
313 | 313 | * @return mixed |
314 | 314 | */ |
315 | - protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
|
315 | + protected function _total_row(EE_Line_Item $line_item, $options = array()) { |
|
316 | 316 | // start of row |
317 | - $html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' ); |
|
317 | + $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
|
318 | 318 | // Total th label |
319 | - $total_label = sprintf( __( 'Transaction Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' ); |
|
320 | - $html .= EEH_HTML::th( $total_label, '', 'jst-rght', '', ' colspan="4"' ); |
|
319 | + $total_label = sprintf(__('Transaction Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
320 | + $html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="4"'); |
|
321 | 321 | // total th |
322 | 322 | |
323 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
323 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
324 | 324 | // end of row |
325 | 325 | $html .= EEH_HTML::trx(); |
326 | 326 | return $html; |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * @param EE_Line_Item $line_item |
57 | 57 | * @param array $options |
58 | - * @return mixed |
|
58 | + * @return string |
|
59 | 59 | */ |
60 | 60 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
61 | 61 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param EE_Line_Item $line_item |
137 | 137 | * @param array $options |
138 | - * @return mixed |
|
138 | + * @return string |
|
139 | 139 | */ |
140 | 140 | private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
141 | 141 | // start of row |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | * |
179 | 179 | * @param EE_Line_Item $line_item |
180 | 180 | * @param array $options |
181 | - * @return mixed |
|
181 | + * @return string |
|
182 | 182 | */ |
183 | 183 | private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
184 | 184 | // start of row |
@@ -57,29 +57,29 @@ discard block |
||
57 | 57 | * @param array $options |
58 | 58 | * @return mixed |
59 | 59 | */ |
60 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
60 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
61 | 61 | |
62 | 62 | $html = ''; |
63 | 63 | // set some default options and merge with incoming |
64 | 64 | $default_options = array( |
65 | - 'show_desc' => TRUE, // TRUE FALSE |
|
65 | + 'show_desc' => TRUE, // TRUE FALSE |
|
66 | 66 | 'odd' => FALSE |
67 | 67 | ); |
68 | - $options = array_merge( $default_options, (array)$options ); |
|
68 | + $options = array_merge($default_options, (array) $options); |
|
69 | 69 | |
70 | - switch( $line_item->type() ) { |
|
70 | + switch ($line_item->type()) { |
|
71 | 71 | |
72 | 72 | case EEM_Line_Item::type_line_item: |
73 | 73 | // item row |
74 | - $html .= $this->_item_row( $line_item, $options ); |
|
74 | + $html .= $this->_item_row($line_item, $options); |
|
75 | 75 | // got any kids? |
76 | - foreach ( $line_item->children() as $child_line_item ) { |
|
77 | - $this->display_line_item( $child_line_item, $options ); |
|
76 | + foreach ($line_item->children() as $child_line_item) { |
|
77 | + $this->display_line_item($child_line_item, $options); |
|
78 | 78 | } |
79 | 79 | break; |
80 | 80 | |
81 | 81 | case EEM_Line_Item::type_sub_line_item: |
82 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
82 | + $html .= $this->_sub_item_row($line_item, $options); |
|
83 | 83 | break; |
84 | 84 | |
85 | 85 | case EEM_Line_Item::type_sub_total: |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | break; |
91 | 91 | |
92 | 92 | case EEM_Line_Item::type_tax_sub_total: |
93 | - foreach ( $line_item->children() as $child_line_item ) { |
|
94 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax ) { |
|
93 | + foreach ($line_item->children() as $child_line_item) { |
|
94 | + if ($child_line_item->type() == EEM_Line_Item::type_tax) { |
|
95 | 95 | // recursively feed children back into this method |
96 | - $this->display_line_item( $child_line_item, $options ); |
|
96 | + $this->display_line_item($child_line_item, $options); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 | break; |
@@ -101,20 +101,20 @@ discard block |
||
101 | 101 | case EEM_Line_Item::type_total: |
102 | 102 | // get all child line items |
103 | 103 | $children = $line_item->children(); |
104 | - if ( $options[ 'set_tax_rate' ] === true ) { |
|
104 | + if ($options['set_tax_rate'] === true) { |
|
105 | 105 | // loop thru tax child line items just to determine tax rate |
106 | - foreach ( $children as $child_line_item ) { |
|
107 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) { |
|
106 | + foreach ($children as $child_line_item) { |
|
107 | + if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) { |
|
108 | 108 | // recursively feed children back into this method |
109 | - $this->display_line_item( $child_line_item, $options ); |
|
109 | + $this->display_line_item($child_line_item, $options); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 | } else { |
113 | 113 | // now loop thru all non-tax child line items |
114 | - foreach ( $children as $child_line_item ) { |
|
115 | - if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) { |
|
114 | + foreach ($children as $child_line_item) { |
|
115 | + if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) { |
|
116 | 116 | // recursively feed children back into this method |
117 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
117 | + $html .= $this->display_line_item($child_line_item, $options); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | } |
@@ -134,10 +134,10 @@ discard block |
||
134 | 134 | * @param array $options |
135 | 135 | * @return mixed |
136 | 136 | */ |
137 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
137 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
138 | 138 | // start of row |
139 | 139 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
140 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
140 | + $html = EEH_HTML::tr('', '', $row_class); |
|
141 | 141 | // name && desc |
142 | 142 | $name_and_desc = apply_filters( |
143 | 143 | 'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__name', |
@@ -146,33 +146,33 @@ discard block |
||
146 | 146 | ); |
147 | 147 | $name_and_desc .= apply_filters( |
148 | 148 | 'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__desc', |
149 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
149 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
150 | 150 | $line_item, |
151 | 151 | $options |
152 | 152 | ); |
153 | - if ( $line_item->is_taxable() ) { |
|
153 | + if ($line_item->is_taxable()) { |
|
154 | 154 | $ticket_price_includes_taxes = EE_Registry::instance()->CFG->tax_settings->prices_displayed_including_taxes |
155 | - ? __( '* price includes taxes', 'event_espresso' ) |
|
156 | - : __( '* price does not include taxes', 'event_espresso' ); |
|
155 | + ? __('* price includes taxes', 'event_espresso') |
|
156 | + : __('* price does not include taxes', 'event_espresso'); |
|
157 | 157 | $name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' |
158 | 158 | . $ticket_price_includes_taxes |
159 | 159 | . '</span>'; |
160 | 160 | } |
161 | 161 | |
162 | 162 | // name td |
163 | - $html .= EEH_HTML::td( $name_and_desc, '', 'item_l' ); |
|
163 | + $html .= EEH_HTML::td($name_and_desc, '', 'item_l'); |
|
164 | 164 | // quantity td |
165 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
165 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
166 | 166 | $tax_rate = $line_item->is_taxable() |
167 | 167 | && EE_Registry::instance()->CFG->tax_settings->prices_displayed_including_taxes |
168 | - ? 1 + ( $this->_tax_rate / 100 ) |
|
168 | + ? 1 + ($this->_tax_rate / 100) |
|
169 | 169 | : 1; |
170 | 170 | // price td |
171 | - $unit_price = EEH_Template::format_currency( $line_item->unit_price() * $tax_rate, false, false ); |
|
172 | - $html .= EEH_HTML::td( $unit_price, '', 'item_c jst-rght' ); |
|
171 | + $unit_price = EEH_Template::format_currency($line_item->unit_price() * $tax_rate, false, false); |
|
172 | + $html .= EEH_HTML::td($unit_price, '', 'item_c jst-rght'); |
|
173 | 173 | // total td |
174 | - $total = EEH_Template::format_currency( $line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false ); |
|
175 | - $html .= EEH_HTML::td( $total, '', 'item_r jst-rght' ); |
|
174 | + $total = EEH_Template::format_currency($line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false); |
|
175 | + $html .= EEH_HTML::td($total, '', 'item_r jst-rght'); |
|
176 | 176 | // end of row |
177 | 177 | $html .= EEH_HTML::trx(); |
178 | 178 | |
@@ -188,22 +188,22 @@ discard block |
||
188 | 188 | * @param array $options |
189 | 189 | * @return mixed |
190 | 190 | */ |
191 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
191 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
192 | 192 | // start of row |
193 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
193 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
194 | 194 | // name && desc |
195 | 195 | $name_and_desc = $line_item->name(); |
196 | - $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : ''; |
|
196 | + $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''; |
|
197 | 197 | // name td |
198 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
198 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
199 | 199 | // discount/surcharge td |
200 | - if ( $line_item->is_percent() ) { |
|
201 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
200 | + if ($line_item->is_percent()) { |
|
201 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
202 | 202 | } else { |
203 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
203 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
204 | 204 | } |
205 | 205 | // total td |
206 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
206 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
207 | 207 | // end of row |
208 | 208 | $html .= EEH_HTML::trx(); |
209 | 209 | return $html; |
@@ -1,16 +1,16 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | 2 | /** |
3 | - * |
|
4 | - * Class EE_Default_Line_Item_Display_Strategy |
|
5 | - * |
|
6 | - * Description |
|
7 | - * |
|
8 | - * @package Event Espresso |
|
9 | - * @subpackage core |
|
10 | - * @author Brent Christensen |
|
11 | - * |
|
12 | - * |
|
13 | - */ |
|
3 | + * |
|
4 | + * Class EE_Default_Line_Item_Display_Strategy |
|
5 | + * |
|
6 | + * Description |
|
7 | + * |
|
8 | + * @package Event Espresso |
|
9 | + * @subpackage core |
|
10 | + * @author Brent Christensen |
|
11 | + * |
|
12 | + * |
|
13 | + */ |
|
14 | 14 | |
15 | 15 | class EE_Default_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
16 | 16 | |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // quantity td |
165 | 165 | $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
166 | 166 | $tax_rate = $line_item->is_taxable() |
167 | - && EE_Registry::instance()->CFG->tax_settings->prices_displayed_including_taxes |
|
167 | + && EE_Registry::instance()->CFG->tax_settings->prices_displayed_including_taxes |
|
168 | 168 | ? 1 + ( $this->_tax_rate / 100 ) |
169 | 169 | : 1; |
170 | 170 | // price td |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | /** |
17 | 17 | * @param EE_Line_Item $line_item |
18 | 18 | * @param array $options |
19 | - * @return mixed |
|
19 | + * @return string |
|
20 | 20 | */ |
21 | 21 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
22 | 22 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * |
95 | 95 | * @param EE_Line_Item $line_item |
96 | 96 | * @param array $options |
97 | - * @return mixed |
|
97 | + * @return string |
|
98 | 98 | */ |
99 | 99 | private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
100 | 100 | // start of row |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * |
124 | 124 | * @param EE_Line_Item $line_item |
125 | 125 | * @param array $options |
126 | - * @return mixed |
|
126 | + * @return string |
|
127 | 127 | */ |
128 | 128 | private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
129 | 129 | // start of row |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * |
154 | 154 | * @param EE_Line_Item $line_item |
155 | 155 | * @param array $options |
156 | - * @return mixed |
|
156 | + * @return string |
|
157 | 157 | */ |
158 | 158 | private function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
159 | 159 | // start of row |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | * @param EE_Line_Item $line_item |
180 | 180 | * @param string $text |
181 | 181 | * @param array $options |
182 | - * @return mixed |
|
182 | + * @return string |
|
183 | 183 | */ |
184 | 184 | private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
185 | 185 | // colspan |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * _separator_row |
204 | 204 | * |
205 | 205 | * @param array $options |
206 | - * @return mixed |
|
206 | + * @return string |
|
207 | 207 | */ |
208 | 208 | private function _separator_row( $options = array() ) { |
209 | 209 | // colspan |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * @param array $options |
19 | 19 | * @return mixed |
20 | 20 | */ |
21 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
21 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
22 | 22 | |
23 | 23 | $html = ''; |
24 | 24 | // set some default options and merge with incoming |
@@ -26,58 +26,58 @@ discard block |
||
26 | 26 | 'show_desc' => TRUE, |
27 | 27 | 'odd' => FALSE |
28 | 28 | ); |
29 | - $options = array_merge( $default_options, (array)$options ); |
|
29 | + $options = array_merge($default_options, (array) $options); |
|
30 | 30 | |
31 | - switch( $line_item->type() ) { |
|
31 | + switch ($line_item->type()) { |
|
32 | 32 | |
33 | 33 | case EEM_Line_Item::type_total: |
34 | 34 | // loop thru children |
35 | - foreach( $line_item->children() as $child_line_item ) { |
|
35 | + foreach ($line_item->children() as $child_line_item) { |
|
36 | 36 | // recursively feed children back into this method |
37 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
37 | + $html .= $this->display_line_item($child_line_item, $options); |
|
38 | 38 | } |
39 | - $html .= $this->_separator_row( $options ); |
|
40 | - $html .= $this->_total_row( $line_item, __('Total', 'event_espresso'), $options ); |
|
39 | + $html .= $this->_separator_row($options); |
|
40 | + $html .= $this->_total_row($line_item, __('Total', 'event_espresso'), $options); |
|
41 | 41 | break; |
42 | 42 | |
43 | 43 | |
44 | 44 | case EEM_Line_Item::type_sub_total: |
45 | 45 | // loop thru children |
46 | - foreach( $line_item->children() as $child_line_item ) { |
|
46 | + foreach ($line_item->children() as $child_line_item) { |
|
47 | 47 | // recursively feed children back into this method |
48 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
48 | + $html .= $this->display_line_item($child_line_item, $options); |
|
49 | 49 | } |
50 | - $html .= $this->_total_row( $line_item, __('Sub-Total', 'event_espresso'), $options ); |
|
50 | + $html .= $this->_total_row($line_item, __('Sub-Total', 'event_espresso'), $options); |
|
51 | 51 | break; |
52 | 52 | |
53 | 53 | |
54 | 54 | case EEM_Line_Item::type_tax_sub_total: |
55 | 55 | // loop thru children |
56 | - foreach( $line_item->children() as $child_line_item ) { |
|
56 | + foreach ($line_item->children() as $child_line_item) { |
|
57 | 57 | // recursively feed children back into this method |
58 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
58 | + $html .= $this->display_line_item($child_line_item, $options); |
|
59 | 59 | } |
60 | - $html .= $this->_total_row( $line_item, __('Tax Total', 'event_espresso'), $options ); |
|
60 | + $html .= $this->_total_row($line_item, __('Tax Total', 'event_espresso'), $options); |
|
61 | 61 | break; |
62 | 62 | |
63 | 63 | |
64 | 64 | case EEM_Line_Item::type_line_item: |
65 | 65 | // item row |
66 | - $html .= $this->_item_row( $line_item, $options ); |
|
66 | + $html .= $this->_item_row($line_item, $options); |
|
67 | 67 | // got any kids? |
68 | - foreach( $line_item->children() as $child_line_item ) { |
|
69 | - $this->display_line_item( $child_line_item, $options ); |
|
68 | + foreach ($line_item->children() as $child_line_item) { |
|
69 | + $this->display_line_item($child_line_item, $options); |
|
70 | 70 | } |
71 | 71 | break; |
72 | 72 | |
73 | 73 | |
74 | 74 | case EEM_Line_Item::type_sub_line_item: |
75 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
75 | + $html .= $this->_sub_item_row($line_item, $options); |
|
76 | 76 | break; |
77 | 77 | |
78 | 78 | |
79 | 79 | case EEM_Line_Item::type_tax: |
80 | - $html .= $this->_tax_row( $line_item, $options ); |
|
80 | + $html .= $this->_tax_row($line_item, $options); |
|
81 | 81 | break; |
82 | 82 | |
83 | 83 | } |
@@ -94,21 +94,21 @@ discard block |
||
94 | 94 | * @param array $options |
95 | 95 | * @return mixed |
96 | 96 | */ |
97 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
97 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
98 | 98 | // start of row |
99 | 99 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
100 | - $html = EEH_HTML::tr( '', $row_class ); |
|
100 | + $html = EEH_HTML::tr('', $row_class); |
|
101 | 101 | // name td |
102 | - $html .= EEH_HTML::td( $line_item->name(), '', 'item_l' ); |
|
102 | + $html .= EEH_HTML::td($line_item->name(), '', 'item_l'); |
|
103 | 103 | // desc td |
104 | - $html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '', 'item_l' ) : ''; |
|
104 | + $html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : ''; |
|
105 | 105 | // quantity td |
106 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l' ); |
|
106 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l'); |
|
107 | 107 | // price td |
108 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c' ); |
|
108 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c'); |
|
109 | 109 | // total td |
110 | - $total = $line_item->is_taxable() ? $line_item->total_no_code() . '*' : $line_item->total_no_code(); |
|
111 | - $html .= EEH_HTML::td( $total, '', 'item_r' ); |
|
110 | + $total = $line_item->is_taxable() ? $line_item->total_no_code().'*' : $line_item->total_no_code(); |
|
111 | + $html .= EEH_HTML::td($total, '', 'item_r'); |
|
112 | 112 | // end of row |
113 | 113 | $html .= EEH_HTML::trx(); |
114 | 114 | return $html; |
@@ -123,22 +123,22 @@ discard block |
||
123 | 123 | * @param array $options |
124 | 124 | * @return mixed |
125 | 125 | */ |
126 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
126 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
127 | 127 | // start of row |
128 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
128 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
129 | 129 | // name td |
130 | - $html .= EEH_HTML::td( $line_item->name(), '', 'item_l sub-item' ); |
|
130 | + $html .= EEH_HTML::td($line_item->name(), '', 'item_l sub-item'); |
|
131 | 131 | // desc td |
132 | - $html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '', 'item_l' ) : ''; |
|
133 | - $html .= EEH_HTML::td() . EEH_HTML::tdx(); |
|
132 | + $html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : ''; |
|
133 | + $html .= EEH_HTML::td().EEH_HTML::tdx(); |
|
134 | 134 | // discount/surcharge td |
135 | - if ( $line_item->is_percent() ) { |
|
136 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
135 | + if ($line_item->is_percent()) { |
|
136 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
137 | 137 | } else { |
138 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c' ); |
|
138 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c'); |
|
139 | 139 | } |
140 | 140 | // total td |
141 | - $html .= EEH_HTML::td( $line_item->total_no_code(), '', 'item_r' ); |
|
141 | + $html .= EEH_HTML::td($line_item->total_no_code(), '', 'item_r'); |
|
142 | 142 | // end of row |
143 | 143 | $html .= EEH_HTML::trx(); |
144 | 144 | return $html; |
@@ -153,17 +153,17 @@ discard block |
||
153 | 153 | * @param array $options |
154 | 154 | * @return mixed |
155 | 155 | */ |
156 | - private function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
156 | + private function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
157 | 157 | // start of row |
158 | - $html = EEH_HTML::tr( '', 'item sub-item tax-total' ); |
|
158 | + $html = EEH_HTML::tr('', 'item sub-item tax-total'); |
|
159 | 159 | // name td |
160 | - $html .= EEH_HTML::td( $line_item->name(), '', 'item_l sub-item' ); |
|
160 | + $html .= EEH_HTML::td($line_item->name(), '', 'item_l sub-item'); |
|
161 | 161 | // desc td |
162 | - $html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '', 'item_l' ) : ''; |
|
162 | + $html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : ''; |
|
163 | 163 | // percent td |
164 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c', '', ' colspan="2"' ); |
|
164 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c', '', ' colspan="2"'); |
|
165 | 165 | // total td |
166 | - $html .= EEH_HTML::td( $line_item->total_no_code(), '', 'item_r' ); |
|
166 | + $html .= EEH_HTML::td($line_item->total_no_code(), '', 'item_r'); |
|
167 | 167 | // end of row |
168 | 168 | $html .= EEH_HTML::trx(); |
169 | 169 | return $html; |
@@ -179,17 +179,17 @@ discard block |
||
179 | 179 | * @param array $options |
180 | 180 | * @return mixed |
181 | 181 | */ |
182 | - private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
182 | + private function _total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
183 | 183 | // colspan |
184 | 184 | $colspan = $options['show_desc'] ? ' colspan="2"' : ''; |
185 | 185 | // start of row |
186 | - $html = EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
186 | + $html = EEH_HTML::tr('', '', 'total_tr odd'); |
|
187 | 187 | // empty td |
188 | - $html .= EEH_HTML::td( EEH_HTML::nbsp(), '', '', '', $colspan ); |
|
188 | + $html .= EEH_HTML::td(EEH_HTML::nbsp(), '', '', '', $colspan); |
|
189 | 189 | // total td |
190 | - $html .= EEH_HTML::td( $text, '', 'total_currency total', '', $colspan ); |
|
190 | + $html .= EEH_HTML::td($text, '', 'total_currency total', '', $colspan); |
|
191 | 191 | // total td |
192 | - $html .= EEH_HTML::td( $line_item->total_no_code(), '', 'total' ); |
|
192 | + $html .= EEH_HTML::td($line_item->total_no_code(), '', 'total'); |
|
193 | 193 | // end of row |
194 | 194 | $html .= EEH_HTML::trx(); |
195 | 195 | return $html; |
@@ -203,11 +203,11 @@ discard block |
||
203 | 203 | * @param array $options |
204 | 204 | * @return mixed |
205 | 205 | */ |
206 | - private function _separator_row( $options = array() ) { |
|
206 | + private function _separator_row($options = array()) { |
|
207 | 207 | // colspan |
208 | 208 | $colspan = $options['show_desc'] ? ' colspan="5"' : ' colspan="4"'; |
209 | 209 | // start of row |
210 | - $html = EEH_HTML::tr( EEH_HTML::td( '<hr>', '', '', '', $colspan )); |
|
210 | + $html = EEH_HTML::tr(EEH_HTML::td('<hr>', '', '', '', $colspan)); |
|
211 | 211 | // // separator td |
212 | 212 | // $html .= EEH_HTML::td( '<hr>', '', '', '', $colspan ); |
213 | 213 | // // end of row |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | 2 | /** |
3 | - * |
|
4 | - * Class EE_Invoice_Line_Item_Display_Strategy |
|
5 | - * |
|
6 | - * Description |
|
7 | - * |
|
8 | - * @package Event Espresso |
|
9 | - * @subpackage core |
|
10 | - * @author Brent Christensen |
|
11 | - * |
|
12 | - * |
|
13 | - */ |
|
3 | + * |
|
4 | + * Class EE_Invoice_Line_Item_Display_Strategy |
|
5 | + * |
|
6 | + * Description |
|
7 | + * |
|
8 | + * @package Event Espresso |
|
9 | + * @subpackage core |
|
10 | + * @author Brent Christensen |
|
11 | + * |
|
12 | + * |
|
13 | + */ |
|
14 | 14 | class EE_Invoice_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
15 | 15 | |
16 | 16 | /** |
@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * @param EE_Line_Item $line_item |
33 | 33 | * @param array $options |
34 | - * @return mixed |
|
34 | + * @return string |
|
35 | 35 | */ |
36 | 36 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
37 | 37 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param array $options |
34 | 34 | * @return mixed |
35 | 35 | */ |
36 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
36 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
37 | 37 | |
38 | 38 | $html = ''; |
39 | 39 | // set some default options and merge with incoming |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | 'show_desc' => TRUE, |
42 | 42 | 'odd' => FALSE |
43 | 43 | ); |
44 | - $options = array_merge( $default_options, (array)$options ); |
|
45 | - switch( $line_item->type() ) { |
|
44 | + $options = array_merge($default_options, (array) $options); |
|
45 | + switch ($line_item->type()) { |
|
46 | 46 | |
47 | 47 | case EEM_Line_Item::type_total: |
48 | 48 | // loop thru children |
49 | - foreach( $line_item->children() as $child_line_item ) { |
|
49 | + foreach ($line_item->children() as $child_line_item) { |
|
50 | 50 | // recursively feed children back into this method |
51 | 51 | // $html .= $this->display_line_item( $child_line_item, $options ); |
52 | 52 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | case EEM_Line_Item::type_sub_total: |
59 | 59 | // loop thru children |
60 | - foreach( $line_item->children() as $child_line_item ) { |
|
60 | + foreach ($line_item->children() as $child_line_item) { |
|
61 | 61 | // recursively feed children back into this method |
62 | 62 | // $html .= $this->display_line_item( $child_line_item, $options ); |
63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | case EEM_Line_Item::type_tax_sub_total: |
69 | 69 | // loop thru children |
70 | - foreach( $line_item->children() as $child_line_item ) { |
|
70 | + foreach ($line_item->children() as $child_line_item) { |
|
71 | 71 | // recursively feed children back into this method |
72 | 72 | // $html .= $this->display_line_item( $child_line_item, $options ); |
73 | 73 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | // item row |
80 | 80 | // $html .= $this->_item_row( $line_item, $options ); |
81 | 81 | // got any kids? |
82 | - foreach( $line_item->children() as $child_line_item ) { |
|
82 | + foreach ($line_item->children() as $child_line_item) { |
|
83 | 83 | // $this->display_line_item( $child_line_item, $options ); |
84 | 84 | } |
85 | 85 | break; |
@@ -14,17 +14,17 @@ |
||
14 | 14 | * ------------------------------------------------------------------------ |
15 | 15 | */ |
16 | 16 | /** |
17 | - * |
|
18 | - * Class EE_Receipt_Line_Item_Display_Strategy |
|
19 | - * |
|
20 | - * Description |
|
21 | - * |
|
22 | - * @package Event Espresso |
|
23 | - * @subpackage core |
|
24 | - * @author Brent Christensen |
|
25 | - * |
|
26 | - * |
|
27 | - */ |
|
17 | + * |
|
18 | + * Class EE_Receipt_Line_Item_Display_Strategy |
|
19 | + * |
|
20 | + * Description |
|
21 | + * |
|
22 | + * @package Event Espresso |
|
23 | + * @subpackage core |
|
24 | + * @author Brent Christensen |
|
25 | + * |
|
26 | + * |
|
27 | + */ |
|
28 | 28 | |
29 | 29 | class EE_Receipt_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
30 | 30 |
@@ -200,7 +200,7 @@ |
||
200 | 200 | * return the _qtips property contents |
201 | 201 | * |
202 | 202 | * @access public |
203 | - * @return EE_Qtip[] |
|
203 | + * @return EE_Qtip |
|
204 | 204 | */ |
205 | 205 | public function get_tips() { |
206 | 206 | return $this->_qtips; |
@@ -177,8 +177,9 @@ discard block |
||
177 | 177 | protected function _construct_tips() { |
178 | 178 | foreach ( $this->_qtipsa as $qt ) { |
179 | 179 | //make sure we have what we need. |
180 | - if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) |
|
181 | - throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class. The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) ); |
|
180 | + if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) { |
|
181 | + throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class. The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) ); |
|
182 | + } |
|
182 | 183 | |
183 | 184 | //make sure the options include defaults and just override via set config. |
184 | 185 | $options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array(); |
@@ -266,8 +267,9 @@ discard block |
||
266 | 267 | |
267 | 268 | public function __construct( $setup_array ) { |
268 | 269 | foreach ( $setup_array as $prop => $value ) { |
269 | - if ( EEH_Class_Tools::has_property( $this, $prop ) ) |
|
270 | - $this->{$prop} = $value; |
|
270 | + if ( EEH_Class_Tools::has_property( $this, $prop ) ) { |
|
271 | + $this->{$prop} = $value; |
|
272 | + } |
|
271 | 273 | } |
272 | 274 | } |
273 | 275 | } |
274 | 276 | \ No newline at end of file |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | 'event' => 'mouseleave', //similar as what you do for show.event. |
143 | 143 | 'target' => false, //Options jQuery::#selector. which html element will trigger hide event. When false, the element the .qtip() method was called upon is used. |
144 | 144 | 'delay' => 0, //set time in milliseconds for delaying the hide of the tooltip |
145 | - 'inactive' => false, //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with) |
|
145 | + 'inactive' => false, //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with) |
|
146 | 146 | 'fixed' => false, //when set to true, the tooltip will not hide if moused over. |
147 | 147 | 'leave' => 'window', //specify whether the tooltip will hide when leaving the window it's conained within. |
148 | 148 | 'distance' => false, //if integer, distance in pixels that the tooltip hides when the mouse is moved from the point it triggered the tooltip. |
@@ -175,21 +175,21 @@ discard block |
||
175 | 175 | * @return void |
176 | 176 | */ |
177 | 177 | protected function _construct_tips() { |
178 | - foreach ( $this->_qtipsa as $qt ) { |
|
178 | + foreach ($this->_qtipsa as $qt) { |
|
179 | 179 | //make sure we have what we need. |
180 | - if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) |
|
181 | - throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class. The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) ); |
|
180 | + if ( ! isset($qt['content_id']) || ! isset($qt['target']) || ! isset($qt['content'])) |
|
181 | + throw new EE_Error(sprintf(__('There is something wrong with the _qtipsa property setup for the %s qtip config class. The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true))); |
|
182 | 182 | |
183 | 183 | //make sure the options include defaults and just override via set config. |
184 | - $options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array(); |
|
185 | - $options = array_merge( $this->_default_options, $options_override ); |
|
184 | + $options_override = isset($qt['options']) ? (array) $qt['options'] : array(); |
|
185 | + $options = array_merge($this->_default_options, $options_override); |
|
186 | 186 | $setup = array( |
187 | 187 | 'content_id' => $qt['content_id'], |
188 | 188 | 'options' => $options, |
189 | 189 | 'target' => $qt['target'], |
190 | 190 | 'content' => $qt['content'] |
191 | 191 | ); |
192 | - $this->_qtips[] = new EE_Qtip( $setup ); |
|
192 | + $this->_qtips[] = new EE_Qtip($setup); |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
@@ -264,9 +264,9 @@ discard block |
||
264 | 264 | public $target; |
265 | 265 | public $content; |
266 | 266 | |
267 | - public function __construct( $setup_array ) { |
|
268 | - foreach ( $setup_array as $prop => $value ) { |
|
269 | - if ( EEH_Class_Tools::has_property( $this, $prop ) ) |
|
267 | + public function __construct($setup_array) { |
|
268 | + foreach ($setup_array as $prop => $value) { |
|
269 | + if (EEH_Class_Tools::has_property($this, $prop)) |
|
270 | 270 | $this->{$prop} = $value; |
271 | 271 | } |
272 | 272 | } |