eventespresso /
event-espresso-core
@@ -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){ |
@@ -10,6 +10,10 @@ |
||
| 10 | 10 | class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{ |
| 11 | 11 | |
| 12 | 12 | protected $_regex = null; |
| 13 | + |
|
| 14 | + /** |
|
| 15 | + * @param string $regex |
|
| 16 | + */ |
|
| 13 | 17 | public function __construct( $validation_error_message = NULL, $regex = null ) { |
| 14 | 18 | $this->_regex = $regex; |
| 15 | 19 | parent::__construct( $validation_error_message ); |
@@ -7,21 +7,21 @@ discard block |
||
| 7 | 7 | * @subpackage Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php. |
| 8 | 8 | * @author Mike Nelson |
| 9 | 9 | */ |
| 10 | -class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
| 10 | +class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
| 11 | 11 | |
| 12 | 12 | protected $_regex = null; |
| 13 | - public function __construct( $validation_error_message = NULL, $regex = null ) { |
|
| 13 | + public function __construct($validation_error_message = NULL, $regex = null) { |
|
| 14 | 14 | $this->_regex = $regex; |
| 15 | - parent::__construct( $validation_error_message ); |
|
| 15 | + parent::__construct($validation_error_message); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * @param $normalized_value |
| 20 | 20 | */ |
| 21 | 21 | public function validate($normalized_value) { |
| 22 | - if( $this->_regex && $normalized_value) { |
|
| 23 | - if( ! preg_match( $this->_regex, $normalized_value ) ) { |
|
| 24 | - throw new EE_Validation_Error( $this->get_validation_error_message(), 'regex' ); |
|
| 22 | + if ($this->_regex && $normalized_value) { |
|
| 23 | + if ( ! preg_match($this->_regex, $normalized_value)) { |
|
| 24 | + throw new EE_Validation_Error($this->get_validation_error_message(), 'regex'); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | } |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | /** |
| 30 | 30 | * @return array |
| 31 | 31 | */ |
| 32 | - function get_jquery_validation_rule_array(){ |
|
| 33 | - if( $this->_regex !== null ){ |
|
| 34 | - return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) ); |
|
| 35 | - }else{ |
|
| 32 | + function get_jquery_validation_rule_array() { |
|
| 33 | + if ($this->_regex !== null) { |
|
| 34 | + return array('regex'=> $this->regex_js(), 'messages' => array('regex' => $this->get_validation_error_message())); |
|
| 35 | + } else { |
|
| 36 | 36 | return array(); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | function regex_js() { |
| 47 | 47 | //first character must be the delimiter |
| 48 | 48 | $delimeter = $this->_regex[0]; |
| 49 | - $last_occurence_of_delimieter = strrpos($this->_regex, $delimeter ); |
|
| 50 | - return substr( $this->_regex, 1, $last_occurence_of_delimieter - 1 ); |
|
| 49 | + $last_occurence_of_delimieter = strrpos($this->_regex, $delimeter); |
|
| 50 | + return substr($this->_regex, 1, $last_occurence_of_delimieter - 1); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | function get_jquery_validation_rule_array(){ |
| 33 | 33 | if( $this->_regex !== null ){ |
| 34 | 34 | return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) ); |
| 35 | - }else{ |
|
| 35 | + } else{ |
|
| 36 | 36 | return array(); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -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", "event_espresso"); |
| 19 | 19 | } |
| 20 | - parent::__construct( $validation_error_message ); |
|
| 20 | + parent::__construct($validation_error_message); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
@@ -30,17 +30,17 @@ 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{ |
|
| 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 | 37 | EE_Registry::instance()->load_helper('URL'); |
| 38 | - if( ! EEH_URL::remote_file_exists( |
|
| 38 | + if ( ! EEH_URL::remote_file_exists( |
|
| 39 | 39 | $normalized_value, |
| 40 | 40 | array( |
| 41 | 41 | 'sslverify' => false, |
| 42 | - '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 |
|
| 43 | - ))){ |
|
| 42 | + '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 |
|
| 43 | + ))) { |
|
| 44 | 44 | throw new EE_Validation_Error(sprintf(__("That URL seems to be broken. Please enter a valid URL", "event_espresso"))); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | /** |
| 53 | 53 | * @return array |
| 54 | 54 | */ |
| 55 | - function get_jquery_validation_rule_array(){ |
|
| 56 | - return array( 'validUrl'=>true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) ); |
|
| 55 | + function get_jquery_validation_rule_array() { |
|
| 56 | + return array('validUrl'=>true, 'messages' => array('validUrl' => $this->get_validation_error_message())); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -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 | EE_Registry::instance()->load_helper('URL'); |
| 38 | 38 | if( ! EEH_URL::remote_file_exists( |
| 39 | 39 | $normalized_value, |
@@ -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,10 +49,10 @@ 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 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
| 55 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
| 54 | + EE_Registry::instance()->load_helper('Template'); |
|
| 55 | + EE_Registry::instance()->load_helper('HTML'); |
|
| 56 | 56 | |
| 57 | 57 | $html = ''; |
| 58 | 58 | // set some default options and merge with incoming |
@@ -63,40 +63,40 @@ discard block |
||
| 63 | 63 | 'taxes_tr_css_class' => 'admin-primary-mbox-taxes-tr', |
| 64 | 64 | 'total_tr_css_class' => 'admin-primary-mbox-total-tr' |
| 65 | 65 | ); |
| 66 | - $options = array_merge( $default_options, (array)$options ); |
|
| 66 | + $options = array_merge($default_options, (array) $options); |
|
| 67 | 67 | |
| 68 | - switch( $line_item->type() ) { |
|
| 68 | + switch ($line_item->type()) { |
|
| 69 | 69 | |
| 70 | 70 | case EEM_Line_Item::type_line_item: |
| 71 | 71 | // item row |
| 72 | - $html .= $this->_item_row( $line_item, $options ); |
|
| 72 | + $html .= $this->_item_row($line_item, $options); |
|
| 73 | 73 | break; |
| 74 | 74 | |
| 75 | 75 | case EEM_Line_Item::type_sub_line_item: |
| 76 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
| 76 | + $html .= $this->_sub_item_row($line_item, $options); |
|
| 77 | 77 | break; |
| 78 | 78 | |
| 79 | 79 | case EEM_Line_Item::type_sub_total: |
| 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,44 +178,44 @@ 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() : __( '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() : __('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 | |
| 200 | 200 | //Type Column |
| 201 | - $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type() . '<br />' : ''; |
|
| 201 | + $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type().'<br />' : ''; |
|
| 202 | 202 | $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
| 203 | - $type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : ''; |
|
| 204 | - $html .= EEH_HTML::td( $type_html, '', 'jst-left' ); |
|
| 203 | + $type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : ''; |
|
| 204 | + $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
|
| 205 | 205 | |
| 206 | 206 | |
| 207 | 207 | //Amount Column |
| 208 | - if ( $line_item->is_percent() ) { |
|
| 209 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' ); |
|
| 208 | + if ($line_item->is_percent()) { |
|
| 209 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght'); |
|
| 210 | 210 | } else { |
| 211 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' ); |
|
| 211 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | //QTY column |
| 215 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'jst-rght' ); |
|
| 215 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'jst-rght'); |
|
| 216 | 216 | |
| 217 | 217 | //total column |
| 218 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 218 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 219 | 219 | |
| 220 | 220 | //finish things off and return |
| 221 | 221 | $html .= EEH_HTML::trx(); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * @param array $options |
| 232 | 232 | * @return mixed |
| 233 | 233 | */ |
| 234 | - protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 234 | + protected function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 235 | 235 | //for now we're not showing sub-items |
| 236 | 236 | return ''; |
| 237 | 237 | } |
@@ -245,13 +245,13 @@ discard block |
||
| 245 | 245 | * @param array $options |
| 246 | 246 | * @return mixed |
| 247 | 247 | */ |
| 248 | - protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 248 | + protected function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
| 249 | 249 | // start of row |
| 250 | - $html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' ); |
|
| 250 | + $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
|
| 251 | 251 | // name th |
| 252 | - $html .= EEH_HTML::th( $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '', 'jst-rght', '', ' colspan="4"' ); |
|
| 252 | + $html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="4"'); |
|
| 253 | 253 | // total th |
| 254 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 254 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 255 | 255 | // end of row |
| 256 | 256 | $html .= EEH_HTML::trx(); |
| 257 | 257 | return $html; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | * @param array $options |
| 269 | 269 | * @return mixed |
| 270 | 270 | */ |
| 271 | - protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
| 271 | + protected function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
| 272 | 272 | //currently not showing subtotal row |
| 273 | 273 | return ''; |
| 274 | 274 | } |
@@ -282,15 +282,15 @@ discard block |
||
| 282 | 282 | * @param array $options |
| 283 | 283 | * @return mixed |
| 284 | 284 | */ |
| 285 | - protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 285 | + protected function _total_row(EE_Line_Item $line_item, $options = array()) { |
|
| 286 | 286 | // start of row |
| 287 | - $html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' ); |
|
| 287 | + $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
|
| 288 | 288 | // Total th label |
| 289 | - $total_label = sprintf( __( 'Transaction Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' ); |
|
| 290 | - $html .= EEH_HTML::th( $total_label, '', 'jst-rght', '', ' colspan="4"' ); |
|
| 289 | + $total_label = sprintf(__('Transaction Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
| 290 | + $html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="4"'); |
|
| 291 | 291 | // total th |
| 292 | 292 | |
| 293 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 293 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 294 | 294 | // end of row |
| 295 | 295 | $html .= EEH_HTML::trx(); |
| 296 | 296 | return $html; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @param EE_Line_Item $line_item |
| 41 | 41 | * @param array $options |
| 42 | - * @return mixed |
|
| 42 | + * @return string |
|
| 43 | 43 | */ |
| 44 | 44 | protected function _item_row( EE_Line_Item $line_item, $options = array() ) { |
| 45 | 45 | $line_item_related_object = $line_item->get_object(); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * |
| 112 | 112 | * @param EE_Line_Item $line_item |
| 113 | 113 | * @param array $options |
| 114 | - * @return mixed |
|
| 114 | + * @return string |
|
| 115 | 115 | */ |
| 116 | 116 | protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
| 117 | 117 | // start of row |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | * |
| 135 | 135 | * @param EE_Line_Item $line_item |
| 136 | 136 | * @param array $options |
| 137 | - * @return mixed |
|
| 137 | + * @return string |
|
| 138 | 138 | */ |
| 139 | 139 | protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
| 140 | 140 | |
@@ -154,13 +154,13 @@ |
||
| 154 | 154 | $total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' ); |
| 155 | 155 | $total_label .= '<br>'; |
| 156 | 156 | $total_label .= '<p class="ee-footnote-text">' |
| 157 | - . sprintf( |
|
| 158 | - __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others. This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ), |
|
| 159 | - '<strong>', |
|
| 160 | - $registration_total, |
|
| 161 | - '</strong>' |
|
| 162 | - ) |
|
| 163 | - . '</p>'; |
|
| 157 | + . sprintf( |
|
| 158 | + __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others. This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ), |
|
| 159 | + '<strong>', |
|
| 160 | + $registration_total, |
|
| 161 | + '</strong>' |
|
| 162 | + ) |
|
| 163 | + . '</p>'; |
|
| 164 | 164 | } |
| 165 | 165 | $html .= EEH_HTML::th( $total_label, '', 'jst-rght', '', ' colspan="3"' ); |
| 166 | 166 | // total th |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | * |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | -class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy { |
|
| 13 | +class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy { |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * Table header for display. |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | * @param array $options |
| 19 | 19 | * @return string |
| 20 | 20 | */ |
| 21 | - protected function _table_header( $options ) { |
|
| 22 | - $html = EEH_HTML::table( '','', $options['table_css_class'] ); |
|
| 21 | + protected function _table_header($options) { |
|
| 22 | + $html = EEH_HTML::table('', '', $options['table_css_class']); |
|
| 23 | 23 | $html .= EEH_HTML::thead(); |
| 24 | 24 | $html .= EEH_HTML::tr(); |
| 25 | - $html .= EEH_HTML::th( __( 'Name', 'event_espresso' ), '', 'jst-left' ); |
|
| 26 | - $html .= EEH_HTML::th( __( 'Type', 'event_espresso'), '', 'jst-left' ); |
|
| 27 | - $html .= EEH_HTML::th( __( 'Date(s)', 'event_espresso' ), '', 'jst-left' ); |
|
| 28 | - $html .= EEH_HTML::th( __( 'Amount', 'event_espresso' ), '', 'jst-cntr' ); |
|
| 25 | + $html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left'); |
|
| 26 | + $html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left'); |
|
| 27 | + $html .= EEH_HTML::th(__('Date(s)', 'event_espresso'), '', 'jst-left'); |
|
| 28 | + $html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr'); |
|
| 29 | 29 | $html .= EEH_HTML::tbody(); |
| 30 | 30 | return $html; |
| 31 | 31 | } |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | * @param array $options |
| 42 | 42 | * @return mixed |
| 43 | 43 | */ |
| 44 | - protected function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 44 | + protected function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 45 | 45 | $line_item_related_object = $line_item->get_object(); |
| 46 | 46 | $parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->get_object() : null; |
| 47 | 47 | // start of row |
| 48 | 48 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
| 49 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
| 49 | + $html = EEH_HTML::tr('', '', $row_class); |
|
| 50 | 50 | |
| 51 | 51 | |
| 52 | 52 | //Name Column |
@@ -54,48 +54,48 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | //related object scope. |
| 56 | 56 | $parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object ? $parent_line_item_related_object->name() : ''; |
| 57 | - $parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name; |
|
| 57 | + $parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name; |
|
| 58 | 58 | $parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links ? $parent_line_item_related_object->get_admin_details_link() : ''; |
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | $name_html = $line_item_related_object instanceof EEI_Line_Item_Object ? $line_item_related_object->name() : $line_item->name(); |
| 62 | - $name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' : $name_html; |
|
| 62 | + $name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' : $name_html; |
|
| 63 | 63 | $name_html .= $line_item->is_taxable() ? ' *' : ''; |
| 64 | 64 | //maybe preface with icon? |
| 65 | - $name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon() . $name_html : $name_html; |
|
| 66 | - $name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>'; |
|
| 67 | - $name_html .= sprintf( |
|
| 68 | - _x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
| 65 | + $name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon().$name_html : $name_html; |
|
| 66 | + $name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>'; |
|
| 67 | + $name_html .= sprintf( |
|
| 68 | + _x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'), |
|
| 69 | 69 | '<span class="ee-line-item-related-parent-object">', |
| 70 | - $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type() : __( 'Item:', 'event_espresso' ), |
|
| 71 | - $parent_related_object_link ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' : $parent_related_object_name, |
|
| 70 | + $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type() : __('Item:', 'event_espresso'), |
|
| 71 | + $parent_related_object_link ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' : $parent_related_object_name, |
|
| 72 | 72 | '</span>' |
| 73 | 73 | ); |
| 74 | - $html .= EEH_HTML::td( $name_html, '', 'jst-left' ); |
|
| 74 | + $html .= EEH_HTML::td($name_html, '', 'jst-left'); |
|
| 75 | 75 | |
| 76 | 76 | //Type Column |
| 77 | - $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type() . '<br />' : ''; |
|
| 77 | + $type_html = $line_item->OBJ_type() ? $line_item->OBJ_type().'<br />' : ''; |
|
| 78 | 78 | $code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : ''; |
| 79 | - $type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : ''; |
|
| 80 | - $html .= EEH_HTML::td( $type_html, '', 'jst-left' ); |
|
| 79 | + $type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : ''; |
|
| 80 | + $html .= EEH_HTML::td($type_html, '', 'jst-left'); |
|
| 81 | 81 | |
| 82 | 82 | //Date column |
| 83 | 83 | $datetime_content = ''; |
| 84 | - if ( $line_item_related_object instanceof EE_Ticket ) { |
|
| 84 | + if ($line_item_related_object instanceof EE_Ticket) { |
|
| 85 | 85 | $datetimes = $line_item_related_object->datetimes(); |
| 86 | - foreach ( $datetimes as $datetime ) { |
|
| 87 | - if ( $datetime instanceof EE_Datetime ) { |
|
| 88 | - $datetime_content .= $datetime->get_dtt_display_name() . '<br>'; |
|
| 86 | + foreach ($datetimes as $datetime) { |
|
| 87 | + if ($datetime instanceof EE_Datetime) { |
|
| 88 | + $datetime_content .= $datetime->get_dtt_display_name().'<br>'; |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | - $html .= EEH_HTML::td( $datetime_content, '', 'jst-left' ); |
|
| 92 | + $html .= EEH_HTML::td($datetime_content, '', 'jst-left'); |
|
| 93 | 93 | |
| 94 | 94 | //Amount Column |
| 95 | - if ( $line_item->is_percent() ) { |
|
| 96 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' ); |
|
| 95 | + if ($line_item->is_percent()) { |
|
| 96 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght'); |
|
| 97 | 97 | } else { |
| 98 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' ); |
|
| 98 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | |
@@ -113,13 +113,13 @@ discard block |
||
| 113 | 113 | * @param array $options |
| 114 | 114 | * @return mixed |
| 115 | 115 | */ |
| 116 | - protected function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 116 | + protected function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
| 117 | 117 | // start of row |
| 118 | - $html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' ); |
|
| 118 | + $html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr'); |
|
| 119 | 119 | // name th |
| 120 | - $html .= EEH_HTML::th( $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '', 'jst-rght', '', ' colspan="3"' ); |
|
| 120 | + $html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="3"'); |
|
| 121 | 121 | // total th |
| 122 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 122 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 123 | 123 | // end of row |
| 124 | 124 | $html .= EEH_HTML::trx(); |
| 125 | 125 | return $html; |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | * @param array $options |
| 137 | 137 | * @return mixed |
| 138 | 138 | */ |
| 139 | - protected function _total_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 139 | + protected function _total_row(EE_Line_Item $line_item, $options = array()) { |
|
| 140 | 140 | |
| 141 | - $registration = isset( $options['EE_Registration'] ) ? $options['EE_Registration'] : null; |
|
| 141 | + $registration = isset($options['EE_Registration']) ? $options['EE_Registration'] : null; |
|
| 142 | 142 | $registration_total = $registration instanceof EE_Registration ? $registration->pretty_final_price() : 0; |
| 143 | 143 | //if no valid registration object then we're not going to show the approximate text. |
| 144 | 144 | $total_match = $registration instanceof EE_Registration ? $registration->final_price() == $line_item->total() : true; |
@@ -146,26 +146,26 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | // start of row |
| 149 | - $html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' ); |
|
| 149 | + $html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr'); |
|
| 150 | 150 | // Total th label |
| 151 | - if ( $total_match ) { |
|
| 152 | - $total_label = sprintf( __( 'This registration\'s total %s:', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' ); |
|
| 151 | + if ($total_match) { |
|
| 152 | + $total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
| 153 | 153 | } else { |
| 154 | - $total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' ); |
|
| 154 | + $total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); |
|
| 155 | 155 | $total_label .= '<br>'; |
| 156 | 156 | $total_label .= '<p class="ee-footnote-text">' |
| 157 | 157 | . sprintf( |
| 158 | - __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others. This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ), |
|
| 158 | + __('The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others. This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso'), |
|
| 159 | 159 | '<strong>', |
| 160 | 160 | $registration_total, |
| 161 | 161 | '</strong>' |
| 162 | 162 | ) |
| 163 | 163 | . '</p>'; |
| 164 | 164 | } |
| 165 | - $html .= EEH_HTML::th( $total_label, '', 'jst-rght', '', ' colspan="3"' ); |
|
| 165 | + $html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="3"'); |
|
| 166 | 166 | // total th |
| 167 | 167 | |
| 168 | - $html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' ); |
|
| 168 | + $html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght'); |
|
| 169 | 169 | // end of row |
| 170 | 170 | $html .= EEH_HTML::trx(); |
| 171 | 171 | 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 |
@@ -1,16 +1,16 @@ |
||
| 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 | - * @since $VID:$ |
|
| 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 | + * @since $VID:$ |
|
| 12 | + * |
|
| 13 | + */ |
|
| 14 | 14 | |
| 15 | 15 | class EE_Default_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
| 16 | 16 | |
@@ -57,32 +57,32 @@ 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 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
| 63 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
| 62 | + EE_Registry::instance()->load_helper('Template'); |
|
| 63 | + EE_Registry::instance()->load_helper('HTML'); |
|
| 64 | 64 | |
| 65 | 65 | $html = ''; |
| 66 | 66 | // set some default options and merge with incoming |
| 67 | 67 | $default_options = array( |
| 68 | - 'show_desc' => TRUE, // TRUE FALSE |
|
| 68 | + 'show_desc' => TRUE, // TRUE FALSE |
|
| 69 | 69 | 'odd' => FALSE |
| 70 | 70 | ); |
| 71 | - $options = array_merge( $default_options, (array)$options ); |
|
| 71 | + $options = array_merge($default_options, (array) $options); |
|
| 72 | 72 | |
| 73 | - switch( $line_item->type() ) { |
|
| 73 | + switch ($line_item->type()) { |
|
| 74 | 74 | |
| 75 | 75 | case EEM_Line_Item::type_line_item: |
| 76 | 76 | // item row |
| 77 | - $html .= $this->_item_row( $line_item, $options ); |
|
| 77 | + $html .= $this->_item_row($line_item, $options); |
|
| 78 | 78 | // got any kids? |
| 79 | - foreach ( $line_item->children() as $child_line_item ) { |
|
| 80 | - $this->display_line_item( $child_line_item, $options ); |
|
| 79 | + foreach ($line_item->children() as $child_line_item) { |
|
| 80 | + $this->display_line_item($child_line_item, $options); |
|
| 81 | 81 | } |
| 82 | 82 | break; |
| 83 | 83 | |
| 84 | 84 | case EEM_Line_Item::type_sub_line_item: |
| 85 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
| 85 | + $html .= $this->_sub_item_row($line_item, $options); |
|
| 86 | 86 | break; |
| 87 | 87 | |
| 88 | 88 | case EEM_Line_Item::type_sub_total: |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | break; |
| 94 | 94 | |
| 95 | 95 | case EEM_Line_Item::type_tax_sub_total: |
| 96 | - foreach ( $line_item->children() as $child_line_item ) { |
|
| 97 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax ) { |
|
| 96 | + foreach ($line_item->children() as $child_line_item) { |
|
| 97 | + if ($child_line_item->type() == EEM_Line_Item::type_tax) { |
|
| 98 | 98 | // recursively feed children back into this method |
| 99 | - $this->display_line_item( $child_line_item, $options ); |
|
| 99 | + $this->display_line_item($child_line_item, $options); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | break; |
@@ -104,20 +104,20 @@ discard block |
||
| 104 | 104 | case EEM_Line_Item::type_total: |
| 105 | 105 | // get all child line items |
| 106 | 106 | $children = $line_item->children(); |
| 107 | - if ( $options[ 'set_tax_rate' ] === true ) { |
|
| 107 | + if ($options['set_tax_rate'] === true) { |
|
| 108 | 108 | // loop thru tax child line items just to determine tax rate |
| 109 | - foreach ( $children as $child_line_item ) { |
|
| 110 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) { |
|
| 109 | + foreach ($children as $child_line_item) { |
|
| 110 | + if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) { |
|
| 111 | 111 | // recursively feed children back into this method |
| 112 | - $this->display_line_item( $child_line_item, $options ); |
|
| 112 | + $this->display_line_item($child_line_item, $options); |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | } else { |
| 116 | 116 | // now loop thru all non-tax child line items |
| 117 | - foreach ( $children as $child_line_item ) { |
|
| 118 | - if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) { |
|
| 117 | + foreach ($children as $child_line_item) { |
|
| 118 | + if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) { |
|
| 119 | 119 | // recursively feed children back into this method |
| 120 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 120 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | } |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | * @param array $options |
| 138 | 138 | * @return mixed |
| 139 | 139 | */ |
| 140 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 140 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 141 | 141 | // start of row |
| 142 | 142 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
| 143 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
| 143 | + $html = EEH_HTML::tr('', '', $row_class); |
|
| 144 | 144 | // name && desc |
| 145 | 145 | $name_and_desc = apply_filters( |
| 146 | 146 | 'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__name', |
@@ -149,22 +149,22 @@ discard block |
||
| 149 | 149 | ); |
| 150 | 150 | $name_and_desc .= apply_filters( |
| 151 | 151 | 'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__desc', |
| 152 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
| 152 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
| 153 | 153 | $line_item, |
| 154 | 154 | $options |
| 155 | 155 | ); |
| 156 | - $name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable item', 'event_espresso' ) . '</span>' : ''; |
|
| 156 | + $name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable item', 'event_espresso').'</span>' : ''; |
|
| 157 | 157 | // name td |
| 158 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
| 158 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
| 159 | 159 | // quantity td |
| 160 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
| 161 | - $tax_rate = $line_item->is_taxable() ? 1 + ( $this->_tax_rate / 100 ) : 1; |
|
| 160 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
| 161 | + $tax_rate = $line_item->is_taxable() ? 1 + ($this->_tax_rate / 100) : 1; |
|
| 162 | 162 | // price td |
| 163 | - $unit_price = EEH_Template::format_currency( $line_item->unit_price() * $tax_rate, false, false ); |
|
| 164 | - $html .= EEH_HTML::td( $unit_price, '', 'item_c jst-rght' ); |
|
| 163 | + $unit_price = EEH_Template::format_currency($line_item->unit_price() * $tax_rate, false, false); |
|
| 164 | + $html .= EEH_HTML::td($unit_price, '', 'item_c jst-rght'); |
|
| 165 | 165 | // total td |
| 166 | - $total = EEH_Template::format_currency( $line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false ); |
|
| 167 | - $html .= EEH_HTML::td( $total, '', 'item_r jst-rght' ); |
|
| 166 | + $total = EEH_Template::format_currency($line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false); |
|
| 167 | + $html .= EEH_HTML::td($total, '', 'item_r jst-rght'); |
|
| 168 | 168 | // end of row |
| 169 | 169 | $html .= EEH_HTML::trx(); |
| 170 | 170 | |
@@ -180,22 +180,22 @@ discard block |
||
| 180 | 180 | * @param array $options |
| 181 | 181 | * @return mixed |
| 182 | 182 | */ |
| 183 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 183 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 184 | 184 | // start of row |
| 185 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
| 185 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
| 186 | 186 | // name && desc |
| 187 | 187 | $name_and_desc = $line_item->name(); |
| 188 | - $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : ''; |
|
| 188 | + $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''; |
|
| 189 | 189 | // name td |
| 190 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
| 190 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
| 191 | 191 | // discount/surcharge td |
| 192 | - if ( $line_item->is_percent() ) { |
|
| 193 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
| 192 | + if ($line_item->is_percent()) { |
|
| 193 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
| 194 | 194 | } else { |
| 195 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
| 195 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
| 196 | 196 | } |
| 197 | 197 | // total td |
| 198 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
| 198 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
| 199 | 199 | // end of row |
| 200 | 200 | $html .= EEH_HTML::trx(); |
| 201 | 201 | return $html; |
@@ -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 |
@@ -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 | - * @since $VID:$ |
|
| 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 | + * @since $VID:$ |
|
| 12 | + * |
|
| 13 | + */ |
|
| 14 | 14 | class EE_Invoice_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
| 15 | 15 | |
| 16 | 16 | /** |
@@ -18,9 +18,9 @@ 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 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
| 23 | + EE_Registry::instance()->load_helper('HTML'); |
|
| 24 | 24 | |
| 25 | 25 | $html = ''; |
| 26 | 26 | // set some default options and merge with incoming |
@@ -28,58 +28,58 @@ discard block |
||
| 28 | 28 | 'show_desc' => TRUE, |
| 29 | 29 | 'odd' => FALSE |
| 30 | 30 | ); |
| 31 | - $options = array_merge( $default_options, (array)$options ); |
|
| 31 | + $options = array_merge($default_options, (array) $options); |
|
| 32 | 32 | |
| 33 | - switch( $line_item->type() ) { |
|
| 33 | + switch ($line_item->type()) { |
|
| 34 | 34 | |
| 35 | 35 | case EEM_Line_Item::type_total: |
| 36 | 36 | // loop thru children |
| 37 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 37 | + foreach ($line_item->children() as $child_line_item) { |
|
| 38 | 38 | // recursively feed children back into this method |
| 39 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 39 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 40 | 40 | } |
| 41 | - $html .= $this->_separator_row( $options ); |
|
| 42 | - $html .= $this->_total_row( $line_item, __('Total', 'event_espresso'), $options ); |
|
| 41 | + $html .= $this->_separator_row($options); |
|
| 42 | + $html .= $this->_total_row($line_item, __('Total', 'event_espresso'), $options); |
|
| 43 | 43 | break; |
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | case EEM_Line_Item::type_sub_total: |
| 47 | 47 | // loop thru children |
| 48 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 48 | + foreach ($line_item->children() as $child_line_item) { |
|
| 49 | 49 | // recursively feed children back into this method |
| 50 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 50 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 51 | 51 | } |
| 52 | - $html .= $this->_total_row( $line_item, __('Sub-Total', 'event_espresso'), $options ); |
|
| 52 | + $html .= $this->_total_row($line_item, __('Sub-Total', 'event_espresso'), $options); |
|
| 53 | 53 | break; |
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | case EEM_Line_Item::type_tax_sub_total: |
| 57 | 57 | // loop thru children |
| 58 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 58 | + foreach ($line_item->children() as $child_line_item) { |
|
| 59 | 59 | // recursively feed children back into this method |
| 60 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 60 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 61 | 61 | } |
| 62 | - $html .= $this->_total_row( $line_item, __('Tax Total', 'event_espresso'), $options ); |
|
| 62 | + $html .= $this->_total_row($line_item, __('Tax Total', 'event_espresso'), $options); |
|
| 63 | 63 | break; |
| 64 | 64 | |
| 65 | 65 | |
| 66 | 66 | case EEM_Line_Item::type_line_item: |
| 67 | 67 | // item row |
| 68 | - $html .= $this->_item_row( $line_item, $options ); |
|
| 68 | + $html .= $this->_item_row($line_item, $options); |
|
| 69 | 69 | // got any kids? |
| 70 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 71 | - $this->display_line_item( $child_line_item, $options ); |
|
| 70 | + foreach ($line_item->children() as $child_line_item) { |
|
| 71 | + $this->display_line_item($child_line_item, $options); |
|
| 72 | 72 | } |
| 73 | 73 | break; |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | case EEM_Line_Item::type_sub_line_item: |
| 77 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
| 77 | + $html .= $this->_sub_item_row($line_item, $options); |
|
| 78 | 78 | break; |
| 79 | 79 | |
| 80 | 80 | |
| 81 | 81 | case EEM_Line_Item::type_tax: |
| 82 | - $html .= $this->_tax_row( $line_item, $options ); |
|
| 82 | + $html .= $this->_tax_row($line_item, $options); |
|
| 83 | 83 | break; |
| 84 | 84 | |
| 85 | 85 | } |
@@ -96,21 +96,21 @@ discard block |
||
| 96 | 96 | * @param array $options |
| 97 | 97 | * @return mixed |
| 98 | 98 | */ |
| 99 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 99 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 100 | 100 | // start of row |
| 101 | 101 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
| 102 | - $html = EEH_HTML::tr( '', $row_class ); |
|
| 102 | + $html = EEH_HTML::tr('', $row_class); |
|
| 103 | 103 | // name td |
| 104 | - $html .= EEH_HTML::td( $line_item->name(), '', 'item_l' ); |
|
| 104 | + $html .= EEH_HTML::td($line_item->name(), '', 'item_l'); |
|
| 105 | 105 | // desc td |
| 106 | - $html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '', 'item_l' ) : ''; |
|
| 106 | + $html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : ''; |
|
| 107 | 107 | // quantity td |
| 108 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l' ); |
|
| 108 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l'); |
|
| 109 | 109 | // price td |
| 110 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c' ); |
|
| 110 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c'); |
|
| 111 | 111 | // total td |
| 112 | - $total = $line_item->is_taxable() ? $line_item->total_no_code() . '*' : $line_item->total_no_code(); |
|
| 113 | - $html .= EEH_HTML::td( $total, '', 'item_r' ); |
|
| 112 | + $total = $line_item->is_taxable() ? $line_item->total_no_code().'*' : $line_item->total_no_code(); |
|
| 113 | + $html .= EEH_HTML::td($total, '', 'item_r'); |
|
| 114 | 114 | // end of row |
| 115 | 115 | $html .= EEH_HTML::trx(); |
| 116 | 116 | return $html; |
@@ -125,22 +125,22 @@ discard block |
||
| 125 | 125 | * @param array $options |
| 126 | 126 | * @return mixed |
| 127 | 127 | */ |
| 128 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 128 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 129 | 129 | // start of row |
| 130 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
| 130 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
| 131 | 131 | // name td |
| 132 | - $html .= EEH_HTML::td( $line_item->name(), '', 'item_l sub-item' ); |
|
| 132 | + $html .= EEH_HTML::td($line_item->name(), '', 'item_l sub-item'); |
|
| 133 | 133 | // desc td |
| 134 | - $html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '', 'item_l' ) : ''; |
|
| 135 | - $html .= EEH_HTML::td() . EEH_HTML::tdx(); |
|
| 134 | + $html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : ''; |
|
| 135 | + $html .= EEH_HTML::td().EEH_HTML::tdx(); |
|
| 136 | 136 | // discount/surcharge td |
| 137 | - if ( $line_item->is_percent() ) { |
|
| 138 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
| 137 | + if ($line_item->is_percent()) { |
|
| 138 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
| 139 | 139 | } else { |
| 140 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c' ); |
|
| 140 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c'); |
|
| 141 | 141 | } |
| 142 | 142 | // total td |
| 143 | - $html .= EEH_HTML::td( $line_item->total_no_code(), '', 'item_r' ); |
|
| 143 | + $html .= EEH_HTML::td($line_item->total_no_code(), '', 'item_r'); |
|
| 144 | 144 | // end of row |
| 145 | 145 | $html .= EEH_HTML::trx(); |
| 146 | 146 | return $html; |
@@ -155,17 +155,17 @@ discard block |
||
| 155 | 155 | * @param array $options |
| 156 | 156 | * @return mixed |
| 157 | 157 | */ |
| 158 | - private function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 158 | + private function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
| 159 | 159 | // start of row |
| 160 | - $html = EEH_HTML::tr( '', 'item sub-item tax-total' ); |
|
| 160 | + $html = EEH_HTML::tr('', 'item sub-item tax-total'); |
|
| 161 | 161 | // name td |
| 162 | - $html .= EEH_HTML::td( $line_item->name(), '', 'item_l sub-item' ); |
|
| 162 | + $html .= EEH_HTML::td($line_item->name(), '', 'item_l sub-item'); |
|
| 163 | 163 | // desc td |
| 164 | - $html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '', 'item_l' ) : ''; |
|
| 164 | + $html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : ''; |
|
| 165 | 165 | // percent td |
| 166 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c', '', ' colspan="2"' ); |
|
| 166 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c', '', ' colspan="2"'); |
|
| 167 | 167 | // total td |
| 168 | - $html .= EEH_HTML::td( $line_item->total_no_code(), '', 'item_r' ); |
|
| 168 | + $html .= EEH_HTML::td($line_item->total_no_code(), '', 'item_r'); |
|
| 169 | 169 | // end of row |
| 170 | 170 | $html .= EEH_HTML::trx(); |
| 171 | 171 | return $html; |
@@ -181,17 +181,17 @@ discard block |
||
| 181 | 181 | * @param array $options |
| 182 | 182 | * @return mixed |
| 183 | 183 | */ |
| 184 | - private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
| 184 | + private function _total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
| 185 | 185 | // colspan |
| 186 | 186 | $colspan = $options['show_desc'] ? ' colspan="2"' : ''; |
| 187 | 187 | // start of row |
| 188 | - $html = EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
| 188 | + $html = EEH_HTML::tr('', '', 'total_tr odd'); |
|
| 189 | 189 | // empty td |
| 190 | - $html .= EEH_HTML::td( EEH_HTML::nbsp(), '', '', '', $colspan ); |
|
| 190 | + $html .= EEH_HTML::td(EEH_HTML::nbsp(), '', '', '', $colspan); |
|
| 191 | 191 | // total td |
| 192 | - $html .= EEH_HTML::td( $text, '', 'total_currency total', '', $colspan ); |
|
| 192 | + $html .= EEH_HTML::td($text, '', 'total_currency total', '', $colspan); |
|
| 193 | 193 | // total td |
| 194 | - $html .= EEH_HTML::td( $line_item->total_no_code(), '', 'total' ); |
|
| 194 | + $html .= EEH_HTML::td($line_item->total_no_code(), '', 'total'); |
|
| 195 | 195 | // end of row |
| 196 | 196 | $html .= EEH_HTML::trx(); |
| 197 | 197 | return $html; |
@@ -205,11 +205,11 @@ discard block |
||
| 205 | 205 | * @param array $options |
| 206 | 206 | * @return mixed |
| 207 | 207 | */ |
| 208 | - private function _separator_row( $options = array() ) { |
|
| 208 | + private function _separator_row($options = array()) { |
|
| 209 | 209 | // colspan |
| 210 | 210 | $colspan = $options['show_desc'] ? ' colspan="5"' : ' colspan="4"'; |
| 211 | 211 | // start of row |
| 212 | - $html = EEH_HTML::tr( EEH_HTML::td( '<hr>', '', '', '', $colspan )); |
|
| 212 | + $html = EEH_HTML::tr(EEH_HTML::td('<hr>', '', '', '', $colspan)); |
|
| 213 | 213 | // // separator td |
| 214 | 214 | // $html .= EEH_HTML::td( '<hr>', '', '', '', $colspan ); |
| 215 | 215 | // // end of row |
@@ -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,9 +33,9 @@ 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 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
| 38 | + EE_Registry::instance()->load_helper('HTML'); |
|
| 39 | 39 | |
| 40 | 40 | $html = ''; |
| 41 | 41 | // set some default options and merge with incoming |
@@ -43,12 +43,12 @@ discard block |
||
| 43 | 43 | 'show_desc' => TRUE, |
| 44 | 44 | 'odd' => FALSE |
| 45 | 45 | ); |
| 46 | - $options = array_merge( $default_options, (array)$options ); |
|
| 47 | - switch( $line_item->type() ) { |
|
| 46 | + $options = array_merge($default_options, (array) $options); |
|
| 47 | + switch ($line_item->type()) { |
|
| 48 | 48 | |
| 49 | 49 | case EEM_Line_Item::type_total: |
| 50 | 50 | // loop thru children |
| 51 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 51 | + foreach ($line_item->children() as $child_line_item) { |
|
| 52 | 52 | // recursively feed children back into this method |
| 53 | 53 | // $html .= $this->display_line_item( $child_line_item, $options ); |
| 54 | 54 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | case EEM_Line_Item::type_sub_total: |
| 61 | 61 | // loop thru children |
| 62 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 62 | + foreach ($line_item->children() as $child_line_item) { |
|
| 63 | 63 | // recursively feed children back into this method |
| 64 | 64 | // $html .= $this->display_line_item( $child_line_item, $options ); |
| 65 | 65 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | case EEM_Line_Item::type_tax_sub_total: |
| 71 | 71 | // loop thru children |
| 72 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 72 | + foreach ($line_item->children() as $child_line_item) { |
|
| 73 | 73 | // recursively feed children back into this method |
| 74 | 74 | // $html .= $this->display_line_item( $child_line_item, $options ); |
| 75 | 75 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | // item row |
| 82 | 82 | // $html .= $this->_item_row( $line_item, $options ); |
| 83 | 83 | // got any kids? |
| 84 | - foreach( $line_item->children() as $child_line_item ) { |
|
| 84 | + foreach ($line_item->children() as $child_line_item) { |
|
| 85 | 85 | // $this->display_line_item( $child_line_item, $options ); |
| 86 | 86 | } |
| 87 | 87 | break; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | /** |
| 68 | 68 | * @param EE_Line_Item $line_item |
| 69 | 69 | * @param array $options |
| 70 | - * @return mixed |
|
| 70 | + * @return string |
|
| 71 | 71 | */ |
| 72 | 72 | public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
| 73 | 73 | |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | * _event_row - basically a Heading row displayed once above each event's ticket rows |
| 207 | 207 | * |
| 208 | 208 | * @param EE_Line_Item $line_item |
| 209 | - * @return mixed |
|
| 209 | + * @return string |
|
| 210 | 210 | */ |
| 211 | 211 | private function _event_row( EE_Line_Item $line_item ) { |
| 212 | 212 | // start of row |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | * |
| 226 | 226 | * @param EE_Line_Item $line_item |
| 227 | 227 | * @param array $options |
| 228 | - * @return mixed |
|
| 228 | + * @return string |
|
| 229 | 229 | */ |
| 230 | 230 | private function _ticket_row( EE_Line_Item $line_item, $options = array() ) { |
| 231 | 231 | // start of row |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | * |
| 269 | 269 | * @param EE_Line_Item $line_item |
| 270 | 270 | * @param array $options |
| 271 | - * @return mixed |
|
| 271 | + * @return string |
|
| 272 | 272 | */ |
| 273 | 273 | private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
| 274 | 274 | // start of row |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * |
| 315 | 315 | * @param EE_Line_Item $line_item |
| 316 | 316 | * @param array $options |
| 317 | - * @return mixed |
|
| 317 | + * @return string |
|
| 318 | 318 | */ |
| 319 | 319 | private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
| 320 | 320 | // start of row |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | * |
| 345 | 345 | * @param EE_Line_Item $line_item |
| 346 | 346 | * @param array $options |
| 347 | - * @return mixed |
|
| 347 | + * @return string |
|
| 348 | 348 | */ |
| 349 | 349 | private function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
| 350 | 350 | // start of row |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | * @param EE_Line_Item $line_item |
| 375 | 375 | * @param string $text |
| 376 | 376 | * @param array $options |
| 377 | - * @return mixed |
|
| 377 | + * @return string |
|
| 378 | 378 | */ |
| 379 | 379 | private function _total_tax_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
| 380 | 380 | $html = ''; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | * @param EE_Line_Item $line_item |
| 402 | 402 | * @param string $text |
| 403 | 403 | * @param array $options |
| 404 | - * @return mixed |
|
| 404 | + * @return string |
|
| 405 | 405 | */ |
| 406 | 406 | private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
| 407 | 407 | $html = ''; |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | * |
| 427 | 427 | * @param EE_Line_Item $line_item |
| 428 | 428 | * @param string $text |
| 429 | - * @return mixed |
|
| 429 | + * @return string |
|
| 430 | 430 | */ |
| 431 | 431 | private function _total_row( EE_Line_Item $line_item, $text = '' ) { |
| 432 | 432 | // start of row |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | * _payments_and_amount_owing_rows |
| 447 | 447 | * |
| 448 | 448 | * @param EE_Line_Item $line_item |
| 449 | - * @return mixed |
|
| 449 | + * @return string |
|
| 450 | 450 | */ |
| 451 | 451 | private function _payments_and_amount_owing_rows( EE_Line_Item $line_item ) { |
| 452 | 452 | $html = ''; |
@@ -1,16 +1,16 @@ |
||
| 1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * Class EE_SPCO_Line_Item_Display_Strategy |
|
| 5 | - * |
|
| 6 | - * Description |
|
| 7 | - * |
|
| 8 | - * @package Event Espresso |
|
| 9 | - * @subpackage core |
|
| 10 | - * @author Brent Christensen |
|
| 11 | - * @since $VID:$ |
|
| 12 | - * |
|
| 13 | - */ |
|
| 3 | + * |
|
| 4 | + * Class EE_SPCO_Line_Item_Display_Strategy |
|
| 5 | + * |
|
| 6 | + * Description |
|
| 7 | + * |
|
| 8 | + * @package Event Espresso |
|
| 9 | + * @subpackage core |
|
| 10 | + * @author Brent Christensen |
|
| 11 | + * @since $VID:$ |
|
| 12 | + * |
|
| 13 | + */ |
|
| 14 | 14 | |
| 15 | 15 | class EE_SPCO_Line_Item_Display_Strategy implements EEI_Line_Item_Display { |
| 16 | 16 | |
@@ -69,104 +69,104 @@ discard block |
||
| 69 | 69 | * @param array $options |
| 70 | 70 | * @return mixed |
| 71 | 71 | */ |
| 72 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
| 72 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
| 73 | 73 | |
| 74 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
| 75 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
| 74 | + EE_Registry::instance()->load_helper('Template'); |
|
| 75 | + EE_Registry::instance()->load_helper('HTML'); |
|
| 76 | 76 | |
| 77 | 77 | $html = ''; |
| 78 | 78 | // set some default options and merge with incoming |
| 79 | 79 | $default_options = array( |
| 80 | - 'show_desc' => true, // true false |
|
| 80 | + 'show_desc' => true, // true false |
|
| 81 | 81 | 'odd' => false |
| 82 | 82 | ); |
| 83 | - $options = array_merge( $default_options, (array)$options ); |
|
| 83 | + $options = array_merge($default_options, (array) $options); |
|
| 84 | 84 | |
| 85 | - switch( $line_item->type() ) { |
|
| 85 | + switch ($line_item->type()) { |
|
| 86 | 86 | |
| 87 | 87 | case EEM_Line_Item::type_line_item: |
| 88 | 88 | $this->_show_taxes = $line_item->is_taxable() ? true : $this->_show_taxes; |
| 89 | - if ( $line_item->OBJ_type() == 'Ticket' ) { |
|
| 89 | + if ($line_item->OBJ_type() == 'Ticket') { |
|
| 90 | 90 | // item row |
| 91 | - $html .= $this->_ticket_row( $line_item, $options ); |
|
| 91 | + $html .= $this->_ticket_row($line_item, $options); |
|
| 92 | 92 | // got any kids? |
| 93 | - foreach ( $line_item->children() as $child_line_item ) { |
|
| 94 | - $this->display_line_item( $child_line_item, $options ); |
|
| 93 | + foreach ($line_item->children() as $child_line_item) { |
|
| 94 | + $this->display_line_item($child_line_item, $options); |
|
| 95 | 95 | } |
| 96 | 96 | } else { |
| 97 | 97 | // item row |
| 98 | - $html .= $this->_item_row( $line_item, $options ); |
|
| 98 | + $html .= $this->_item_row($line_item, $options); |
|
| 99 | 99 | // got any kids? |
| 100 | - foreach ( $line_item->children() as $child_line_item ) { |
|
| 101 | - $this->display_line_item( $child_line_item, $options ); |
|
| 100 | + foreach ($line_item->children() as $child_line_item) { |
|
| 101 | + $this->display_line_item($child_line_item, $options); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | break; |
| 105 | 105 | |
| 106 | 106 | case EEM_Line_Item::type_sub_line_item: |
| 107 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
| 107 | + $html .= $this->_sub_item_row($line_item, $options); |
|
| 108 | 108 | break; |
| 109 | 109 | |
| 110 | 110 | case EEM_Line_Item::type_sub_total: |
| 111 | 111 | static $sub_total = 0; |
| 112 | 112 | $event_sub_total = 0; |
| 113 | - $text = __( 'Sub-Total', 'event_espresso' ); |
|
| 114 | - if ( $line_item->OBJ_type() == 'Event' ) { |
|
| 115 | - $options[ 'event_id' ] = $event_id = $line_item->OBJ_ID(); |
|
| 116 | - if ( ! isset( $this->_events[ $options[ 'event_id' ] ] ) ) { |
|
| 117 | - $event = EEM_Event::instance()->get_one_by_ID( $options[ 'event_id' ] ); |
|
| 118 | - if ( $event instanceof EE_Event ) { |
|
| 119 | - if ( $event->default_registration_status() == EEM_Registration::status_id_not_approved ) { |
|
| 113 | + $text = __('Sub-Total', 'event_espresso'); |
|
| 114 | + if ($line_item->OBJ_type() == 'Event') { |
|
| 115 | + $options['event_id'] = $event_id = $line_item->OBJ_ID(); |
|
| 116 | + if ( ! isset($this->_events[$options['event_id']])) { |
|
| 117 | + $event = EEM_Event::instance()->get_one_by_ID($options['event_id']); |
|
| 118 | + if ($event instanceof EE_Event) { |
|
| 119 | + if ($event->default_registration_status() == EEM_Registration::status_id_not_approved) { |
|
| 120 | 120 | return ''; |
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | - $this->_events[ $options[ 'event_id' ] ] = 0; |
|
| 124 | - $html .= $this->_event_row( $line_item ); |
|
| 125 | - $text = __( 'Event Sub-Total', 'event_espresso' ); |
|
| 123 | + $this->_events[$options['event_id']] = 0; |
|
| 124 | + $html .= $this->_event_row($line_item); |
|
| 125 | + $text = __('Event Sub-Total', 'event_espresso'); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | $child_line_items = $line_item->children(); |
| 129 | 129 | // loop thru children |
| 130 | - foreach( $child_line_items as $child_line_item ) { |
|
| 130 | + foreach ($child_line_items as $child_line_item) { |
|
| 131 | 131 | // recursively feed children back into this method |
| 132 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 132 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 133 | 133 | } |
| 134 | - $event_sub_total += isset( $options[ 'event_id' ] ) ? $this->_events[ $options[ 'event_id' ] ] : 0; |
|
| 134 | + $event_sub_total += isset($options['event_id']) ? $this->_events[$options['event_id']] : 0; |
|
| 135 | 135 | $sub_total += $event_sub_total; |
| 136 | 136 | if ( |
| 137 | 137 | ( |
| 138 | 138 | // event subtotals |
| 139 | 139 | $line_item->code() != 'pre-tax-subtotal' && |
| 140 | - count( $child_line_items ) > 1 |
|
| 140 | + count($child_line_items) > 1 |
|
| 141 | 141 | ) |
| 142 | 142 | || |
| 143 | 143 | ( |
| 144 | 144 | // pre-tax subtotals |
| 145 | 145 | $line_item->code() == 'pre-tax-subtotal' && |
| 146 | - count( $this->_events ) > 1 |
|
| 146 | + count($this->_events) > 1 |
|
| 147 | 147 | ) |
| 148 | 148 | ) { |
| 149 | 149 | $options['sub_total'] = $line_item->OBJ_type() == 'Event' ? $event_sub_total : $sub_total; |
| 150 | - $html .= $this->_sub_total_row( $line_item, $text, $options ); |
|
| 150 | + $html .= $this->_sub_total_row($line_item, $text, $options); |
|
| 151 | 151 | } |
| 152 | 152 | break; |
| 153 | 153 | |
| 154 | 154 | case EEM_Line_Item::type_tax: |
| 155 | - if ( $this->_show_taxes ) { |
|
| 156 | - $this->_taxes_html .= $this->_tax_row( $line_item, $options ); |
|
| 155 | + if ($this->_show_taxes) { |
|
| 156 | + $this->_taxes_html .= $this->_tax_row($line_item, $options); |
|
| 157 | 157 | } |
| 158 | 158 | break; |
| 159 | 159 | |
| 160 | 160 | case EEM_Line_Item::type_tax_sub_total: |
| 161 | - if ( $this->_show_taxes ) { |
|
| 161 | + if ($this->_show_taxes) { |
|
| 162 | 162 | $child_line_items = $line_item->children(); |
| 163 | 163 | // loop thru children |
| 164 | - foreach( $child_line_items as $child_line_item ) { |
|
| 164 | + foreach ($child_line_items as $child_line_item) { |
|
| 165 | 165 | // recursively feed children back into this method |
| 166 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 166 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 167 | 167 | } |
| 168 | - if ( count( $child_line_items ) > 1 ) { |
|
| 169 | - $this->_taxes_html .= $this->_total_tax_row( $line_item, __( 'Tax Total', 'event_espresso' ), $options ); |
|
| 168 | + if (count($child_line_items) > 1) { |
|
| 169 | + $this->_taxes_html .= $this->_total_tax_row($line_item, __('Tax Total', 'event_espresso'), $options); |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | break; |
@@ -175,22 +175,22 @@ discard block |
||
| 175 | 175 | // get all child line items |
| 176 | 176 | $children = $line_item->children(); |
| 177 | 177 | // loop thru all non-tax child line items |
| 178 | - foreach( $children as $child_line_item ) { |
|
| 179 | - if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) { |
|
| 178 | + foreach ($children as $child_line_item) { |
|
| 179 | + if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) { |
|
| 180 | 180 | // recursively feed children back into this method |
| 181 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 181 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | // now loop thru tax child line items |
| 186 | - foreach( $children as $child_line_item ) { |
|
| 187 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) { |
|
| 186 | + foreach ($children as $child_line_item) { |
|
| 187 | + if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) { |
|
| 188 | 188 | // recursively feed children back into this method |
| 189 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
| 189 | + $html .= $this->display_line_item($child_line_item, $options); |
|
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | $html .= $this->_taxes_html; |
| 193 | - $html .= $this->_total_row( $line_item, __('Total', 'event_espresso') ); |
|
| 193 | + $html .= $this->_total_row($line_item, __('Total', 'event_espresso')); |
|
| 194 | 194 | |
| 195 | 195 | |
| 196 | 196 | //$html .= $this->_payments_and_amount_owing_rows( $line_item ); |
@@ -208,11 +208,11 @@ discard block |
||
| 208 | 208 | * @param EE_Line_Item $line_item |
| 209 | 209 | * @return mixed |
| 210 | 210 | */ |
| 211 | - private function _event_row( EE_Line_Item $line_item ) { |
|
| 211 | + private function _event_row(EE_Line_Item $line_item) { |
|
| 212 | 212 | // start of row |
| 213 | - $html = EEH_HTML::tr( '', 'event-cart-total-row', 'total_tr odd' ); |
|
| 213 | + $html = EEH_HTML::tr('', 'event-cart-total-row', 'total_tr odd'); |
|
| 214 | 214 | // event name td |
| 215 | - $html .= EEH_HTML::td( EEH_HTML::strong( $line_item->name() ), '', 'event-header', '', ' colspan="4"' ); |
|
| 215 | + $html .= EEH_HTML::td(EEH_HTML::strong($line_item->name()), '', 'event-header', '', ' colspan="4"'); |
|
| 216 | 216 | // end of row |
| 217 | 217 | $html .= EEH_HTML::trx(); |
| 218 | 218 | return $html; |
@@ -227,10 +227,10 @@ discard block |
||
| 227 | 227 | * @param array $options |
| 228 | 228 | * @return mixed |
| 229 | 229 | */ |
| 230 | - private function _ticket_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 230 | + private function _ticket_row(EE_Line_Item $line_item, $options = array()) { |
|
| 231 | 231 | // start of row |
| 232 | 232 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
| 233 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
| 233 | + $html = EEH_HTML::tr('', '', $row_class); |
|
| 234 | 234 | // name && desc |
| 235 | 235 | $name_and_desc = apply_filters( |
| 236 | 236 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name', |
@@ -239,23 +239,23 @@ discard block |
||
| 239 | 239 | ); |
| 240 | 240 | $name_and_desc .= apply_filters( |
| 241 | 241 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc', |
| 242 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
| 242 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
| 243 | 243 | $line_item, |
| 244 | 244 | $options |
| 245 | 245 | ); |
| 246 | 246 | $name_and_desc .= $line_item->is_taxable() ? ' * ' : ''; |
| 247 | 247 | // name td |
| 248 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
| 248 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
| 249 | 249 | // price td |
| 250 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
| 250 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
| 251 | 251 | // quantity td |
| 252 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
| 252 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
| 253 | 253 | $this->_total_items += $line_item->quantity(); |
| 254 | 254 | // determine total for line item |
| 255 | 255 | $total = $line_item->total(); |
| 256 | - $this->_events[ $options[ 'event_id' ] ] += $total; |
|
| 256 | + $this->_events[$options['event_id']] += $total; |
|
| 257 | 257 | // total td |
| 258 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '', 'item_r jst-rght' ); |
|
| 258 | + $html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght'); |
|
| 259 | 259 | // end of row |
| 260 | 260 | $html .= EEH_HTML::trx(); |
| 261 | 261 | return $html; |
@@ -270,38 +270,38 @@ discard block |
||
| 270 | 270 | * @param array $options |
| 271 | 271 | * @return mixed |
| 272 | 272 | */ |
| 273 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 273 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 274 | 274 | // start of row |
| 275 | 275 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
| 276 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
| 276 | + $html = EEH_HTML::tr('', '', $row_class); |
|
| 277 | 277 | // name && desc |
| 278 | 278 | $name_and_desc = apply_filters( |
| 279 | 279 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name', |
| 280 | - $line_item->OBJ_type() . ': ' . $line_item->name(), |
|
| 280 | + $line_item->OBJ_type().': '.$line_item->name(), |
|
| 281 | 281 | $line_item |
| 282 | 282 | ); |
| 283 | 283 | $name_and_desc .= apply_filters( |
| 284 | 284 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc', |
| 285 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
| 285 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
| 286 | 286 | $line_item, |
| 287 | 287 | $options |
| 288 | 288 | ); |
| 289 | 289 | $name_and_desc .= $line_item->is_taxable() ? ' * ' : ''; |
| 290 | 290 | // name td |
| 291 | - $html .= EEH_HTML::td( $name_and_desc, '', 'item_l' ); |
|
| 291 | + $html .= EEH_HTML::td($name_and_desc, '', 'item_l'); |
|
| 292 | 292 | // price td |
| 293 | - if ( $line_item->is_percent() ) { |
|
| 294 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c jst-rght' ); |
|
| 293 | + if ($line_item->is_percent()) { |
|
| 294 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c jst-rght'); |
|
| 295 | 295 | } else { |
| 296 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
| 296 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
| 297 | 297 | } |
| 298 | 298 | // quantity td |
| 299 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
| 299 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
| 300 | 300 | //$total = $line_item->total() * $line_item->quantity(); |
| 301 | 301 | $total = $line_item->total(); |
| 302 | - $this->_events[ $options[ 'event_id' ] ] += $total; |
|
| 302 | + $this->_events[$options['event_id']] += $total; |
|
| 303 | 303 | // total td |
| 304 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '', 'item_r jst-rght' ); |
|
| 304 | + $html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght'); |
|
| 305 | 305 | // end of row |
| 306 | 306 | $html .= EEH_HTML::trx(); |
| 307 | 307 | return $html; |
@@ -316,22 +316,22 @@ discard block |
||
| 316 | 316 | * @param array $options |
| 317 | 317 | * @return mixed |
| 318 | 318 | */ |
| 319 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 319 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
| 320 | 320 | // start of row |
| 321 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
| 321 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
| 322 | 322 | // name && desc |
| 323 | 323 | $name_and_desc = $line_item->name(); |
| 324 | - $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : ''; |
|
| 324 | + $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''; |
|
| 325 | 325 | // name td |
| 326 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
| 326 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
| 327 | 327 | // discount/surcharge td |
| 328 | - if ( $line_item->is_percent() ) { |
|
| 329 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
| 328 | + if ($line_item->is_percent()) { |
|
| 329 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
| 330 | 330 | } else { |
| 331 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
| 331 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
| 332 | 332 | } |
| 333 | 333 | // total td |
| 334 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
| 334 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
| 335 | 335 | // end of row |
| 336 | 336 | $html .= EEH_HTML::trx(); |
| 337 | 337 | return $html; |
@@ -346,21 +346,21 @@ discard block |
||
| 346 | 346 | * @param array $options |
| 347 | 347 | * @return mixed |
| 348 | 348 | */ |
| 349 | - private function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
| 349 | + private function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
| 350 | 350 | // start of row |
| 351 | - $html = EEH_HTML::tr( '', 'item sub-item tax-total' ); |
|
| 351 | + $html = EEH_HTML::tr('', 'item sub-item tax-total'); |
|
| 352 | 352 | // name && desc |
| 353 | 353 | $name_and_desc = $line_item->name(); |
| 354 | - $name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable items', 'event_espresso' ) . '</span>'; |
|
| 355 | - $name_and_desc .= $options[ 'show_desc' ] ? '<br/>' . $line_item->desc() : ''; |
|
| 354 | + $name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable items', 'event_espresso').'</span>'; |
|
| 355 | + $name_and_desc .= $options['show_desc'] ? '<br/>'.$line_item->desc() : ''; |
|
| 356 | 356 | // name td |
| 357 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
| 357 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
| 358 | 358 | // percent td |
| 359 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', ' jst-rght', '' ); |
|
| 359 | + $html .= EEH_HTML::td($line_item->percent().'%', '', ' jst-rght', ''); |
|
| 360 | 360 | // empty td (price) |
| 361 | - $html .= EEH_HTML::td( EEH_HTML::nbsp() ); |
|
| 361 | + $html .= EEH_HTML::td(EEH_HTML::nbsp()); |
|
| 362 | 362 | // total td |
| 363 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
| 363 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
| 364 | 364 | // end of row |
| 365 | 365 | $html .= EEH_HTML::trx(); |
| 366 | 366 | return $html; |
@@ -376,17 +376,17 @@ discard block |
||
| 376 | 376 | * @param array $options |
| 377 | 377 | * @return mixed |
| 378 | 378 | */ |
| 379 | - private function _total_tax_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
| 379 | + private function _total_tax_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
| 380 | 380 | $html = ''; |
| 381 | - if ( $line_item->total() ) { |
|
| 381 | + if ($line_item->total()) { |
|
| 382 | 382 | // start of row |
| 383 | - $html = EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
| 383 | + $html = EEH_HTML::tr('', '', 'total_tr odd'); |
|
| 384 | 384 | // total td |
| 385 | - $html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="2"' ); |
|
| 385 | + $html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="2"'); |
|
| 386 | 386 | // empty td (price) |
| 387 | - $html .= EEH_HTML::td( EEH_HTML::nbsp() ); |
|
| 387 | + $html .= EEH_HTML::td(EEH_HTML::nbsp()); |
|
| 388 | 388 | // total td |
| 389 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'total jst-rght' ); |
|
| 389 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght'); |
|
| 390 | 390 | // end of row |
| 391 | 391 | $html .= EEH_HTML::trx(); |
| 392 | 392 | } |
@@ -403,15 +403,15 @@ discard block |
||
| 403 | 403 | * @param array $options |
| 404 | 404 | * @return mixed |
| 405 | 405 | */ |
| 406 | - private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
| 406 | + private function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
| 407 | 407 | $html = ''; |
| 408 | - if ( $line_item->total() ) { |
|
| 408 | + if ($line_item->total()) { |
|
| 409 | 409 | // start of row |
| 410 | - $html = EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
| 410 | + $html = EEH_HTML::tr('', '', 'total_tr odd'); |
|
| 411 | 411 | // total td |
| 412 | - $html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="3"' ); |
|
| 412 | + $html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"'); |
|
| 413 | 413 | // total td |
| 414 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $options[ 'sub_total' ], false, false ), '', 'total jst-rght' ); |
|
| 414 | + $html .= EEH_HTML::td(EEH_Template::format_currency($options['sub_total'], false, false), '', 'total jst-rght'); |
|
| 415 | 415 | // end of row |
| 416 | 416 | $html .= EEH_HTML::trx(); |
| 417 | 417 | } |
@@ -428,13 +428,13 @@ discard block |
||
| 428 | 428 | * @param string $text |
| 429 | 429 | * @return mixed |
| 430 | 430 | */ |
| 431 | - private function _total_row( EE_Line_Item $line_item, $text = '' ) { |
|
| 431 | + private function _total_row(EE_Line_Item $line_item, $text = '') { |
|
| 432 | 432 | // start of row |
| 433 | - $html = EEH_HTML::tr( '', '', 'spco-grand-total total_tr odd' ); |
|
| 433 | + $html = EEH_HTML::tr('', '', 'spco-grand-total total_tr odd'); |
|
| 434 | 434 | // total td |
| 435 | - $html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="3"' ); |
|
| 435 | + $html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"'); |
|
| 436 | 436 | // total td |
| 437 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'total jst-rght' ); |
|
| 437 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght'); |
|
| 438 | 438 | // end of row |
| 439 | 439 | $html .= EEH_HTML::trx(); |
| 440 | 440 | return $html; |
@@ -448,26 +448,26 @@ discard block |
||
| 448 | 448 | * @param EE_Line_Item $line_item |
| 449 | 449 | * @return mixed |
| 450 | 450 | */ |
| 451 | - private function _payments_and_amount_owing_rows( EE_Line_Item $line_item ) { |
|
| 451 | + private function _payments_and_amount_owing_rows(EE_Line_Item $line_item) { |
|
| 452 | 452 | $html = ''; |
| 453 | - $transaction = EEM_Transaction::instance()->get_one_by_ID( $line_item->TXN_ID() ); |
|
| 454 | - if ( $transaction instanceof EE_Transaction ) { |
|
| 453 | + $transaction = EEM_Transaction::instance()->get_one_by_ID($line_item->TXN_ID()); |
|
| 454 | + if ($transaction instanceof EE_Transaction) { |
|
| 455 | 455 | $payments = $transaction->approved_payments(); |
| 456 | - if ( ! empty( $payments )) { |
|
| 457 | - foreach ( $payments as $payment ) { |
|
| 458 | - if ( $payment instanceof EE_Payment ) { |
|
| 456 | + if ( ! empty($payments)) { |
|
| 457 | + foreach ($payments as $payment) { |
|
| 458 | + if ($payment instanceof EE_Payment) { |
|
| 459 | 459 | //$owing = $owing - $payment->amount(); |
| 460 | 460 | $payment_desc = sprintf( |
| 461 | 461 | __('Payment%1$s Received: %2$s', 'event_espresso'), |
| 462 | - $payment->txn_id_chq_nmbr() != '' ? ' <span class="small-text">(#' . $payment->txn_id_chq_nmbr() . ')</span> ' : '', |
|
| 462 | + $payment->txn_id_chq_nmbr() != '' ? ' <span class="small-text">(#'.$payment->txn_id_chq_nmbr().')</span> ' : '', |
|
| 463 | 463 | $payment->timestamp() |
| 464 | 464 | ); |
| 465 | 465 | // start of row |
| 466 | - $html .= EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
| 466 | + $html .= EEH_HTML::tr('', '', 'total_tr odd'); |
|
| 467 | 467 | // payment desc |
| 468 | - $html .= EEH_HTML::td( $payment_desc, '', '', '', ' colspan="3"' ); |
|
| 468 | + $html .= EEH_HTML::td($payment_desc, '', '', '', ' colspan="3"'); |
|
| 469 | 469 | // total td |
| 470 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $payment->amount(), false, false ), '', 'total jst-rght' ); |
|
| 470 | + $html .= EEH_HTML::td(EEH_Template::format_currency($payment->amount(), false, false), '', 'total jst-rght'); |
|
| 471 | 471 | // end of row |
| 472 | 472 | $html .= EEH_HTML::trx(); |
| 473 | 473 | } |
