@@ -101,7 +101,7 @@ |
||
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | - * @param $payment_method_type |
|
| 104 | + * @param EE_PMT_Base $payment_method_type |
|
| 105 | 105 | * @throws EE_Error |
| 106 | 106 | */ |
| 107 | 107 | public function set_payment_method_type( $payment_method_type ){ |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | * Specialized form for payment methods, allowing for easy setting and retrieving of meta fields. |
| 5 | 5 | * Uses EEM_Payment_Method as the model |
| 6 | 6 | */ |
| 7 | -class EE_Payment_Method_Form extends EE_Model_Form_Section{ |
|
| 7 | +class EE_Payment_Method_Form extends EE_Model_Form_Section { |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * All the subsection inputs that correspond ot extra meta rows |
@@ -39,37 +39,37 @@ discard block |
||
| 39 | 39 | * @see EE_Model_Form_Section::__construct() for more |
| 40 | 40 | * } |
| 41 | 41 | */ |
| 42 | - public function __construct($options_array = array()){ |
|
| 42 | + public function __construct($options_array = array()) { |
|
| 43 | 43 | $this->_model = EEM_Payment_Method::instance(); |
| 44 | 44 | $this->_options_array = $options_array; |
| 45 | - if(isset($options_array['payment_method_type'])){ |
|
| 45 | + if (isset($options_array['payment_method_type'])) { |
|
| 46 | 46 | $this->_payment_method_type = $options_array['payment_method_type']; |
| 47 | 47 | } |
| 48 | 48 | $options_array = $this->_options_array; |
| 49 | - if(isset($options_array['extra_meta_inputs'])){ |
|
| 50 | - $this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs,$options_array['extra_meta_inputs']); |
|
| 49 | + if (isset($options_array['extra_meta_inputs'])) { |
|
| 50 | + $this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs, $options_array['extra_meta_inputs']); |
|
| 51 | 51 | } |
| 52 | - if($this->_extra_meta_inputs){ |
|
| 53 | - $this->_subsections = array_merge($this->_subsections,$this->_extra_meta_inputs); |
|
| 52 | + if ($this->_extra_meta_inputs) { |
|
| 53 | + $this->_subsections = array_merge($this->_subsections, $this->_extra_meta_inputs); |
|
| 54 | 54 | } |
| 55 | 55 | $this->_subsections['PMD_button_url'] = new EE_Admin_File_Uploader_Input( |
| 56 | - array( 'html_label_text'=> __( 'Button URL', 'event_espresso' )) |
|
| 56 | + array('html_label_text'=> __('Button URL', 'event_espresso')) |
|
| 57 | 57 | ); |
| 58 | 58 | $this->_subsections['PMD_scope'] = new EE_Checkbox_Multi_Input( |
| 59 | 59 | EEM_Payment_Method::instance()->scopes(), |
| 60 | - array( 'html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename() . EEH_Template::get_help_tab_link( 'payment_methods_overview' )) |
|
| 60 | + array('html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename().EEH_Template::get_help_tab_link('payment_methods_overview')) |
|
| 61 | 61 | ); |
| 62 | 62 | //setup the currency options |
| 63 | 63 | $this->_subsections['Currency'] = new EE_Select_Multi_Model_Input( |
| 64 | - EEM_Currency::instance()->get_all_currencies_usable_by( $this->_payment_method_type ), |
|
| 64 | + EEM_Currency::instance()->get_all_currencies_usable_by($this->_payment_method_type), |
|
| 65 | 65 | array( |
| 66 | - 'html_label_text'=> __( 'Currencies Supported', 'event_espresso' ), |
|
| 66 | + 'html_label_text'=> __('Currencies Supported', 'event_espresso'), |
|
| 67 | 67 | 'required'=>TRUE |
| 68 | 68 | ) |
| 69 | 69 | ); |
| 70 | - $this->_subsections['PMD_order'] = new EE_Text_Input( array( |
|
| 71 | - 'html_label_text' => __( 'Order', 'event_espresso' ), |
|
| 72 | - 'html_help_text' => __( 'Lowest numbers will be shown first', 'event_espresso' ), |
|
| 70 | + $this->_subsections['PMD_order'] = new EE_Text_Input(array( |
|
| 71 | + 'html_label_text' => __('Order', 'event_espresso'), |
|
| 72 | + 'html_help_text' => __('Lowest numbers will be shown first', 'event_espresso'), |
|
| 73 | 73 | 'normalization_strategy' => new EE_Int_Normalization(), |
| 74 | 74 | 'validation_strategies' => array( |
| 75 | 75 | new EE_Int_Validation_Strategy() |
@@ -78,9 +78,9 @@ discard block |
||
| 78 | 78 | )); |
| 79 | 79 | $this->_layout_strategy = new EE_Admin_Two_Column_Layout(); |
| 80 | 80 | parent::__construct($options_array); |
| 81 | - $debug_mode = isset( $this->_subsections[ 'PMD_debug_mode' ] ) ? $this->_subsections[ 'PMD_debug_mode' ] : null; |
|
| 82 | - if( $debug_mode instanceof EE_Form_Input_Base ) { |
|
| 83 | - $debug_mode->set_html_help_text( __( 'This payment method has a Sandbox Server (also known as Testing Server, Development Server, Quality Assurance Server, etc). While in debug mode and using this sandbox server, real payments will not be processed.', 'event_espresso' ) ); |
|
| 81 | + $debug_mode = isset($this->_subsections['PMD_debug_mode']) ? $this->_subsections['PMD_debug_mode'] : null; |
|
| 82 | + if ($debug_mode instanceof EE_Form_Input_Base) { |
|
| 83 | + $debug_mode->set_html_help_text(__('This payment method has a Sandbox Server (also known as Testing Server, Development Server, Quality Assurance Server, etc). While in debug mode and using this sandbox server, real payments will not be processed.', 'event_espresso')); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
@@ -92,15 +92,15 @@ discard block |
||
| 92 | 92 | * @param string $name |
| 93 | 93 | * @throws EE_Error |
| 94 | 94 | */ |
| 95 | - public function _construct_finalize( $parent_form_section, $name ) { |
|
| 96 | - if( ! $this->_payment_method_type instanceof EE_PMT_Base ){ |
|
| 97 | - throw new EE_Error( sprintf( __( 'Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso' ))); |
|
| 95 | + public function _construct_finalize($parent_form_section, $name) { |
|
| 96 | + if ( ! $this->_payment_method_type instanceof EE_PMT_Base) { |
|
| 97 | + throw new EE_Error(sprintf(__('Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso'))); |
|
| 98 | 98 | } |
| 99 | 99 | //set the name of this form based on the payment method type |
| 100 | - if( ! $this->_name && ! $name ){ |
|
| 101 | - $name = str_replace(" ","_",ucwords(str_replace("_"," ",($this->_payment_method_type->system_name()))))."_Settings_Form"; |
|
| 100 | + if ( ! $this->_name && ! $name) { |
|
| 101 | + $name = str_replace(" ", "_", ucwords(str_replace("_", " ", ($this->_payment_method_type->system_name()))))."_Settings_Form"; |
|
| 102 | 102 | } |
| 103 | - parent::_construct_finalize( $parent_form_section, $name ); |
|
| 103 | + parent::_construct_finalize($parent_form_section, $name); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | |
@@ -109,8 +109,8 @@ discard block |
||
| 109 | 109 | * @param $payment_method_type |
| 110 | 110 | * @throws EE_Error |
| 111 | 111 | */ |
| 112 | - public function set_payment_method_type( $payment_method_type ){ |
|
| 113 | - if( ! $payment_method_type instanceof EE_PMT_Base){ |
|
| 112 | + public function set_payment_method_type($payment_method_type) { |
|
| 113 | + if ( ! $payment_method_type instanceof EE_PMT_Base) { |
|
| 114 | 114 | throw new EE_Error(sprintf(__("Payment Method forms MUST set a payment method type by using _set_payment_method_type", "event_espresso"))); |
| 115 | 115 | } |
| 116 | 116 | $this->_payment_method_type = $payment_method_type; |
@@ -122,10 +122,10 @@ discard block |
||
| 122 | 122 | * extends the model form section's save method to also save the extra meta field values |
| 123 | 123 | * @return int ID of the payment method inserted, or true on update |
| 124 | 124 | */ |
| 125 | - public function save(){ |
|
| 125 | + public function save() { |
|
| 126 | 126 | $parent_save_val = parent::save(); |
| 127 | - if( $this->_model_object && $this->_model_object->ID()){ |
|
| 128 | - foreach($this->_extra_meta_inputs as $input_name => $input){ |
|
| 127 | + if ($this->_model_object && $this->_model_object->ID()) { |
|
| 128 | + foreach ($this->_extra_meta_inputs as $input_name => $input) { |
|
| 129 | 129 | $this->_model_object->update_extra_meta($input_name, $input->normalized_value()); |
| 130 | 130 | } |
| 131 | 131 | } |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | $model_obj = $this->_model->ensure_is_obj($model_obj); |
| 143 | 143 | parent::populate_model_obj($model_obj); |
| 144 | 144 | $extra_meta = $model_obj->all_extra_meta_array(); |
| 145 | - foreach($this->_extra_meta_inputs as $input_name => $extra_meta_input){ |
|
| 146 | - if(isset($extra_meta[$input_name])){ |
|
| 145 | + foreach ($this->_extra_meta_inputs as $input_name => $extra_meta_input) { |
|
| 146 | + if (isset($extra_meta[$input_name])) { |
|
| 147 | 147 | $extra_meta_input->set_default($extra_meta[$input_name]); |
| 148 | 148 | } |
| 149 | 149 | } |
@@ -155,10 +155,10 @@ discard block |
||
| 155 | 155 | * gets the default name of this form section if none is specified |
| 156 | 156 | * @return string |
| 157 | 157 | */ |
| 158 | - protected function _set_default_name_if_empty(){ |
|
| 159 | - if( ! $this->_name ){ |
|
| 160 | - $default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form"; |
|
| 161 | - $this->_name = $default_name; |
|
| 158 | + protected function _set_default_name_if_empty() { |
|
| 159 | + if ( ! $this->_name) { |
|
| 160 | + $default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form"; |
|
| 161 | + $this->_name = $default_name; |
|
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | * Gets all the extra meta inputs in this form |
| 169 | 169 | * @return EE_Form_Input_Base[] |
| 170 | 170 | */ |
| 171 | - public function extra_meta_inputs(){ |
|
| 171 | + public function extra_meta_inputs() { |
|
| 172 | 172 | return $this->_extra_meta_inputs; |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | /** |
| 81 | 81 | * Checks if that value is the one selected |
| 82 | 82 | * @param string|int $value unnormalized value option (string) |
| 83 | - * @return string |
|
| 83 | + * @return boolean |
|
| 84 | 84 | */ |
| 85 | 85 | protected function _check_if_option_selected( $value ){ |
| 86 | 86 | return $this->_input->raw_value() == $value ? TRUE : FALSE; |
@@ -38,15 +38,15 @@ |
||
| 38 | 38 | if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) { |
| 39 | 39 | EEH_HTML::indent( 1, 'optgroup' ); |
| 40 | 40 | foreach( $this->_input->options() as $opt_group_label => $opt_group ){ |
| 41 | - if ( ! empty($opt_group_label)) { |
|
| 42 | - $html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">'; |
|
| 43 | - } |
|
| 41 | + if ( ! empty($opt_group_label)) { |
|
| 42 | + $html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">'; |
|
| 43 | + } |
|
| 44 | 44 | EEH_HTML::indent( 1, 'option' ); |
| 45 | 45 | $html .= $this->_display_options( $opt_group ); |
| 46 | 46 | EEH_HTML::indent( -1, 'option' ); |
| 47 | - if ( ! empty($opt_group_label)) { |
|
| 48 | - $html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>'; |
|
| 49 | - } |
|
| 47 | + if ( ! empty($opt_group_label)) { |
|
| 48 | + $html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>'; |
|
| 49 | + } |
|
| 50 | 50 | } |
| 51 | 51 | EEH_HTML::indent( -1, 'optgroup' ); |
| 52 | 52 | } else { |
@@ -11,49 +11,49 @@ discard block |
||
| 11 | 11 | * @since $VID:$ |
| 12 | 12 | * |
| 13 | 13 | */ |
| 14 | -class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{ |
|
| 14 | +class EE_Select_Display_Strategy extends EE_Display_Strategy_Base { |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * |
| 18 | 18 | * @throws EE_Error |
| 19 | 19 | * @return string of html to display the field |
| 20 | 20 | */ |
| 21 | - function display(){ |
|
| 22 | - if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){ |
|
| 23 | - throw new EE_Error( sprintf( __( 'Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso' ))); |
|
| 21 | + function display() { |
|
| 22 | + if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) { |
|
| 23 | + throw new EE_Error(sprintf(__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso'))); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - $html = EEH_HTML::nl( 0, 'select' ); |
|
| 26 | + $html = EEH_HTML::nl(0, 'select'); |
|
| 27 | 27 | $html .= '<select'; |
| 28 | - $html .= ' id="' . $this->_input->html_id() . '"'; |
|
| 29 | - $html .= ' name="' . $this->_input->html_name() . '"'; |
|
| 30 | - $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class(); |
|
| 31 | - $html .= ' class="' . $class . '"'; |
|
| 28 | + $html .= ' id="'.$this->_input->html_id().'"'; |
|
| 29 | + $html .= ' name="'.$this->_input->html_name().'"'; |
|
| 30 | + $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class(); |
|
| 31 | + $html .= ' class="'.$class.'"'; |
|
| 32 | 32 | // add html5 required |
| 33 | 33 | $html .= $this->_input->required() ? ' required' : ''; |
| 34 | - $html .= ' style="' . $this->_input->html_style() . '"'; |
|
| 35 | - $html .= ' ' . $this->_input->other_html_attributes(); |
|
| 34 | + $html .= ' style="'.$this->_input->html_style().'"'; |
|
| 35 | + $html .= ' '.$this->_input->other_html_attributes(); |
|
| 36 | 36 | $html .= '>'; |
| 37 | 37 | |
| 38 | - if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) { |
|
| 39 | - EEH_HTML::indent( 1, 'optgroup' ); |
|
| 40 | - foreach( $this->_input->options() as $opt_group_label => $opt_group ){ |
|
| 38 | + if (EEH_Array::is_multi_dimensional_array($this->_input->options())) { |
|
| 39 | + EEH_HTML::indent(1, 'optgroup'); |
|
| 40 | + foreach ($this->_input->options() as $opt_group_label => $opt_group) { |
|
| 41 | 41 | if ( ! empty($opt_group_label)) { |
| 42 | - $html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">'; |
|
| 42 | + $html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">'; |
|
| 43 | 43 | } |
| 44 | - EEH_HTML::indent( 1, 'option' ); |
|
| 45 | - $html .= $this->_display_options( $opt_group ); |
|
| 44 | + EEH_HTML::indent(1, 'option'); |
|
| 45 | + $html .= $this->_display_options($opt_group); |
|
| 46 | 46 | EEH_HTML::indent( -1, 'option' ); |
| 47 | 47 | if ( ! empty($opt_group_label)) { |
| 48 | - $html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>'; |
|
| 48 | + $html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>'; |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | EEH_HTML::indent( -1, 'optgroup' ); |
| 52 | 52 | } else { |
| 53 | - $html.=$this->_display_options( $this->_input->options() ); |
|
| 53 | + $html .= $this->_display_options($this->_input->options()); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - $html.= EEH_HTML::nl( 0, 'select' ) . '</select>'; |
|
| 56 | + $html .= EEH_HTML::nl(0, 'select').'</select>'; |
|
| 57 | 57 | return $html; |
| 58 | 58 | } |
| 59 | 59 | |
@@ -64,13 +64,13 @@ discard block |
||
| 64 | 64 | * @param array $options |
| 65 | 65 | * @return string |
| 66 | 66 | */ |
| 67 | - protected function _display_options($options){ |
|
| 67 | + protected function _display_options($options) { |
|
| 68 | 68 | $html = ''; |
| 69 | - EEH_HTML::indent( 1, 'option' ); |
|
| 70 | - foreach( $options as $value => $display_text ){ |
|
| 71 | - $unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one( $value ); |
|
| 72 | - $selected = $this->_check_if_option_selected( $unnormalized_value ) ? ' selected="selected"' : ''; |
|
| 73 | - $html.= EEH_HTML::nl( 0, 'option' ) . '<option value="' . esc_attr( $unnormalized_value ) . '"' . $selected . '>' . $display_text . '</option>'; |
|
| 69 | + EEH_HTML::indent(1, 'option'); |
|
| 70 | + foreach ($options as $value => $display_text) { |
|
| 71 | + $unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value); |
|
| 72 | + $selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected="selected"' : ''; |
|
| 73 | + $html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>'; |
|
| 74 | 74 | } |
| 75 | 75 | EEH_HTML::indent( -1, 'option' ); |
| 76 | 76 | return $html; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @param string|int $value unnormalized value option (string) |
| 84 | 84 | * @return string |
| 85 | 85 | */ |
| 86 | - protected function _check_if_option_selected( $value ){ |
|
| 86 | + protected function _check_if_option_selected($value) { |
|
| 87 | 87 | return $this->_input->raw_value() == $value ? TRUE : FALSE; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * @param string $value_to_normalize |
| 14 | - * @return int|mixed|string |
|
| 14 | + * @return integer |
|
| 15 | 15 | * @throws \EE_Validation_Error |
| 16 | 16 | */ |
| 17 | 17 | public function normalize($value_to_normalize) { |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | * @subpackage |
| 8 | 8 | * @author Mike Nelson |
| 9 | 9 | */ |
| 10 | -class EE_Int_Normalization extends EE_Normalization_Strategy_Base{ |
|
| 10 | +class EE_Int_Normalization extends EE_Normalization_Strategy_Base { |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * @param string $value_to_normalize |
@@ -15,33 +15,33 @@ discard block |
||
| 15 | 15 | * @throws \EE_Validation_Error |
| 16 | 16 | */ |
| 17 | 17 | public function normalize($value_to_normalize) { |
| 18 | - if( is_int( $value_to_normalize ) ){ |
|
| 18 | + if (is_int($value_to_normalize)) { |
|
| 19 | 19 | return $value_to_normalize; |
| 20 | 20 | } |
| 21 | - if( ! is_string( $value_to_normalize )){ |
|
| 22 | - throw new EE_Validation_Error( sprintf( __( 'The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso' ), print_r( $value_to_normalize, TRUE), gettype( $value_to_normalize ) ) ); |
|
| 21 | + if ( ! is_string($value_to_normalize)) { |
|
| 22 | + throw new EE_Validation_Error(sprintf(__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), print_r($value_to_normalize, TRUE), gettype($value_to_normalize))); |
|
| 23 | 23 | } |
| 24 | 24 | $thousands_separator = EE_Config::instance()->currency->thsnds; |
| 25 | - $value_to_normalize = str_replace( $thousands_separator, "", $value_to_normalize ); |
|
| 26 | - $value_to_normalize = str_replace( array(" ","\t"), '', $value_to_normalize ); |
|
| 27 | - if ( preg_match( '/^\d+$/', $value_to_normalize )) { |
|
| 28 | - return intval( $value_to_normalize ); |
|
| 25 | + $value_to_normalize = str_replace($thousands_separator, "", $value_to_normalize); |
|
| 26 | + $value_to_normalize = str_replace(array(" ", "\t"), '', $value_to_normalize); |
|
| 27 | + if (preg_match('/^\d+$/', $value_to_normalize)) { |
|
| 28 | + return intval($value_to_normalize); |
|
| 29 | 29 | } else { |
| 30 | 30 | //find if this input has a int validation strategy |
| 31 | 31 | //in which case, use its message |
| 32 | 32 | $validation_error_message = NULL; |
| 33 | - foreach( $this->_input->get_validation_strategies() as $validation_strategy ){ |
|
| 34 | - if( $validation_strategy instanceof EE_Int_Validation_Strategy ){ |
|
| 33 | + foreach ($this->_input->get_validation_strategies() as $validation_strategy) { |
|
| 34 | + if ($validation_strategy instanceof EE_Int_Validation_Strategy) { |
|
| 35 | 35 | $validation_error_message = $validation_strategy->get_validation_error_message(); |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | //this really shouldn't ever happen because fields with a int normalization strategy |
| 39 | 39 | //should also have a int validation strategy, but in case it doesnt use the default |
| 40 | - if( ! $validation_error_message ){ |
|
| 40 | + if ( ! $validation_error_message) { |
|
| 41 | 41 | $default_validation_strategy = new EE_Int_Validation_Strategy(); |
| 42 | 42 | $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
| 43 | 43 | } |
| 44 | - throw new EE_Validation_Error( $validation_error_message, 'numeric_only' ); |
|
| 44 | + throw new EE_Validation_Error($validation_error_message, 'numeric_only'); |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
@@ -50,10 +50,10 @@ discard block |
||
| 50 | 50 | * @param int $normalized_value |
| 51 | 51 | * @return string |
| 52 | 52 | */ |
| 53 | - public function unnormalize( $normalized_value ) { |
|
| 54 | - if( empty( $normalized_value ) ){ |
|
| 53 | + public function unnormalize($normalized_value) { |
|
| 54 | + if (empty($normalized_value)) { |
|
| 55 | 55 | return '0'; |
| 56 | - }else{ |
|
| 56 | + } else { |
|
| 57 | 57 | return "$normalized_value"; |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | public function unnormalize( $normalized_value ) { |
| 54 | 54 | if( empty( $normalized_value ) ){ |
| 55 | 55 | return '0'; |
| 56 | - }else{ |
|
| 56 | + } else{ |
|
| 57 | 57 | return "$normalized_value"; |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -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 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | /** |
| 28 | 28 | * Applies all teh individual item validation strategies on each item in the array |
| 29 | 29 | * @param array $normalized_value |
| 30 | - * @return boolean |
|
| 30 | + * @return boolean|null |
|
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
| 33 | 33 | if( is_array($normalized_value)){ |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | * @since 4.6 |
| 12 | 12 | * |
| 13 | 13 | */ |
| 14 | -class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
| 14 | +class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
| 15 | 15 | protected $_individual_item_validation_strategies = array(); |
| 16 | 16 | /** |
| 17 | 17 | * |
| 18 | 18 | * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base) |
| 19 | 19 | */ |
| 20 | 20 | public function __construct($individual_item_validation_strategies) { |
| 21 | - if( ! is_array($individual_item_validation_strategies)){ |
|
| 21 | + if ( ! is_array($individual_item_validation_strategies)) { |
|
| 22 | 22 | $individual_item_validation_strategies = array($individual_item_validation_strategies); |
| 23 | 23 | } |
| 24 | 24 | $this->_individual_item_validation_strategies = $individual_item_validation_strategies; |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | * @return boolean |
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
| 33 | - if( is_array($normalized_value)){ |
|
| 33 | + if (is_array($normalized_value)) { |
|
| 34 | 34 | $items_to_validate = $normalized_value; |
| 35 | - }else{ |
|
| 35 | + } else { |
|
| 36 | 36 | $items_to_validate = array($normalized_value); |
| 37 | 37 | } |
| 38 | - foreach($items_to_validate as $individual_item){ |
|
| 39 | - foreach($this->_individual_item_validation_strategies as $validation_strategy){ |
|
| 40 | - if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
| 38 | + foreach ($items_to_validate as $individual_item) { |
|
| 39 | + foreach ($this->_individual_item_validation_strategies as $validation_strategy) { |
|
| 40 | + if ($validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
| 41 | 41 | $validation_strategy->validate($individual_item); |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | function _construct_finalize(\EE_Form_Input_Base $form_input) { |
| 52 | 52 | parent::_construct_finalize($form_input); |
| 53 | - foreach($this->_individual_item_validation_strategies as $item_validation_strategy){ |
|
| 54 | - if ( $item_validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
| 53 | + foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) { |
|
| 54 | + if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
| 55 | 55 | $item_validation_strategy->_construct_finalize($form_input); |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | function validate($normalized_value) { |
| 33 | 33 | if( is_array($normalized_value)){ |
| 34 | 34 | $items_to_validate = $normalized_value; |
| 35 | - }else{ |
|
| 35 | + } else{ |
|
| 36 | 36 | $items_to_validate = array($normalized_value); |
| 37 | 37 | } |
| 38 | 38 | foreach($items_to_validate as $individual_item){ |
@@ -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; |
@@ -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 | |
@@ -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 | - * @since $VID:$ |
|
| 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 | + * @since $VID:$ |
|
| 26 | + * |
|
| 27 | + */ |
|
| 28 | 28 | |
| 29 | 29 | class EE_Receipt_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
| 30 | 30 | |
@@ -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; |
@@ -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 | } |