Completed
Branch BUG-9548-transaction-completio... (f1723a)
by
unknown
592:31 queued 571:19
created
strategies/validation/EE_Float_Validation_Strategy.strategy.php 3 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
  * @since 				4.6
9 9
  *
10 10
  */
11
-class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base{
11
+class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base {
12 12
 
13 13
 	/**
14 14
 	 * @param null $validation_error_message
15 15
 	 */
16
-	public function __construct( $validation_error_message = NULL ) {
17
-		if( ! $validation_error_message ){
16
+	public function __construct($validation_error_message = NULL) {
17
+		if ( ! $validation_error_message) {
18 18
 			$validation_error_message = sprintf(__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso"));
19 19
 		}
20
-		parent::__construct( $validation_error_message );
20
+		parent::__construct($validation_error_message);
21 21
 	}
22 22
 
23 23
 
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 	/**
37 37
 	 * @return array
38 38
 	 */
39
-	function get_jquery_validation_rule_array(){
40
-		return array('number'=>true, 'messages' => array( 'number' => $this->get_validation_error_message() ) );
39
+	function get_jquery_validation_rule_array() {
40
+		return array('number'=>true, 'messages' => array('number' => $this->get_validation_error_message()));
41 41
 	}
42 42
 }
43 43
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3
- * Class EE_Float_Validation_Strategy
4
- *
5
- * @package 			Event Espresso
6
- * @subpackage 	core
7
- * @author 				Mike Nelson
8
- * @since 				4.6
9
- *
10
- */
3
+	 * Class EE_Float_Validation_Strategy
4
+	 *
5
+	 * @package 			Event Espresso
6
+	 * @subpackage 	core
7
+	 * @author 				Mike Nelson
8
+	 * @since 				4.6
9
+	 *
10
+	 */
11 11
 class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base{
12 12
 
13 13
 	/**
Please login to merge, or discard this patch.
strategies/validation/EE_Full_HTML_Validation_Strategy.strategy.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -10,21 +10,21 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6
11 11
  *
12 12
  */
13
-class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
13
+class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
14 14
 
15 15
 	/**
16 16
 	 * @param null $validation_error_message
17 17
 	 */
18
-	public function __construct( $validation_error_message = NULL ) {
19
-		if ( ! $validation_error_message ) {
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20 20
 			global $allowedposttags;
21 21
 			$validation_error_message = sprintf(
22
-				__( 'Only the following HTML tags are allowed:%1$s%2$s', "event_espresso" ),
22
+				__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
23 23
 				'<br />',
24
-				implode( ",", array_keys( $allowedposttags ) )
24
+				implode(",", array_keys($allowedposttags))
25 25
 			);
26 26
 		}
27
-		parent::__construct( $validation_error_message );
27
+		parent::__construct($validation_error_message);
28 28
 	}
29 29
 
30 30
 
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function validate($normalized_value) {
37 37
 		global $allowedposttags;
38
-		parent::validate( $normalized_value );
39
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value", $allowedposttags );
40
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
41
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
38
+		parent::validate($normalized_value);
39
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedposttags);
40
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
41
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
42 42
 		}
43 43
 	}
44 44
 }
45 45
\ No newline at end of file
Please login to merge, or discard this patch.
form_sections/strategies/validation/EE_Int_Validation_Strategy.strategy.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3
- * EE_Int_Validation_Strategy
4
- *
5
- * @package			Event Espresso
6
- * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
7
- * @author				Mike Nelson
8
- */
3
+	 * EE_Int_Validation_Strategy
4
+	 *
5
+	 * @package			Event Espresso
6
+	 * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
7
+	 * @author				Mike Nelson
8
+	 */
9 9
 class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base{
10 10
 
11 11
 	/**
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base{
9
+class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base {
10 10
 
11 11
 	/**
12 12
 	 * @param null $validation_error_message
13 13
 	 */
14
-	public function __construct( $validation_error_message = NULL ) {
15
-		if( ! $validation_error_message ){
14
+	public function __construct($validation_error_message = NULL) {
15
+		if ( ! $validation_error_message) {
16 16
 			$validation_error_message = __("Only digits are allowed.", "event_espresso");
17 17
 		}
18
-		parent::__construct( $validation_error_message );
18
+		parent::__construct($validation_error_message);
19 19
 	}
20 20
 
21 21
 
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 	/**
33 33
 	 * @return array
34 34
 	 */
35
-	function get_jquery_validation_rule_array(){
36
-		return array('digits'=>true, 'messages' => array( 'digits' => $this->get_validation_error_message() ) );
35
+	function get_jquery_validation_rule_array() {
36
+		return array('digits'=>true, 'messages' => array('digits' => $this->get_validation_error_message()));
37 37
 	}
38 38
 }
39 39
 
Please login to merge, or discard this patch.
strategies/validation/EE_Min_Length_Validation_Strategy.strategy.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,32 +8,32 @@
 block discarded – undo
8 8
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
9 9
  * @author				Mike Nelson
10 10
  */
11
-class EE_Min_Length_Validation_Strategy extends EE_Validation_Strategy_Base{
11
+class EE_Min_Length_Validation_Strategy extends EE_Validation_Strategy_Base {
12 12
 
13 13
 	protected $_min_length;
14 14
 
15
-	public function __construct( $validation_error_message = NULL, $min_length = 0 ) {
15
+	public function __construct($validation_error_message = NULL, $min_length = 0) {
16 16
 		$this->_min_length = $min_length;
17
-		parent::__construct( $validation_error_message );
17
+		parent::__construct($validation_error_message);
18 18
 	}
19 19
 
20 20
 	/**
21 21
 	 * @param $normalized_value
22 22
 	 */
23 23
 	public function validate($normalized_value) {
24
-		if( $this->_min_length > 0 &&
24
+		if ($this->_min_length > 0 &&
25 25
 				$normalized_value &&
26
-				is_string( $normalized_value ) &&
27
-				strlen( $normalized_value ) < $this->_min_length){
28
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'minlength' );
26
+				is_string($normalized_value) &&
27
+				strlen($normalized_value) < $this->_min_length) {
28
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'minlength');
29 29
 		}
30 30
 	}
31 31
 
32 32
 	/**
33 33
 	 * @return array
34 34
 	 */
35
-	function get_jquery_validation_rule_array(){
36
-		return array( 'minlength'=> $this->_min_length, 'messages' => array( 'minlength' => $this->get_validation_error_message() ) );
35
+	function get_jquery_validation_rule_array() {
36
+		return array('minlength'=> $this->_min_length, 'messages' => array('minlength' => $this->get_validation_error_message()));
37 37
 	}
38 38
 }
39 39
 
Please login to merge, or discard this patch.
strategies/validation/EE_Plaintext_Validation_Strategy.strategy.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6
11 11
  *
12 12
  */
13
-class EE_Plaintext_Validation_Strategy extends EE_Validation_Strategy_Base{
13
+class EE_Plaintext_Validation_Strategy extends EE_Validation_Strategy_Base {
14 14
 
15 15
 	/**
16 16
 	 * @param null $validation_error_message
17 17
 	 */
18
-	public function __construct( $validation_error_message = NULL ) {
19
-		if( ! $validation_error_message ){
20
-			$validation_error_message = __( "HTML tags are not permitted in this field", "event_espresso" );
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20
+			$validation_error_message = __("HTML tags are not permitted in this field", "event_espresso");
21 21
 		}
22
-		parent::__construct( $validation_error_message );
22
+		parent::__construct($validation_error_message);
23 23
 	}
24 24
 
25 25
 	/**
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 	 * @throws \EE_Validation_Error
28 28
 	 */
29 29
 	public function validate($normalized_value) {
30
-		$no_tags = wp_strip_all_tags( $normalized_value );
31
-		if( strlen( $no_tags ) < strlen( trim( $normalized_value ) ) ) {
32
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'no_html_tags' );
30
+		$no_tags = wp_strip_all_tags($normalized_value);
31
+		if (strlen($no_tags) < strlen(trim($normalized_value))) {
32
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
33 33
 		}
34 34
 		parent::validate($normalized_value);
35 35
 	}
Please login to merge, or discard this patch.
strategies/validation/EE_Required_Validation_Strategy.strategy.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
  * @since 				4.6
9 9
  *
10 10
  */
11
-class EE_Required_Validation_Strategy extends EE_Validation_Strategy_Base{
11
+class EE_Required_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 = __("This field is required.", "event_espresso");
19 19
 		}
20
-		parent::__construct( $validation_error_message );
20
+		parent::__construct($validation_error_message);
21 21
 	}
22 22
 
23 23
 
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	 * @throws \EE_Validation_Error
31 31
 	 */
32 32
 	function validate($normalized_value) {
33
-		if( $normalized_value === '' || $normalized_value === NULL || $normalized_value === array()){
34
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
35
-		}else{
33
+		if ($normalized_value === '' || $normalized_value === NULL || $normalized_value === array()) {
34
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
35
+		} else {
36 36
 			return true;
37 37
 		}
38 38
 	}
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	/**
43 43
 	 * @return array
44 44
 	 */
45
-	function get_jquery_validation_rule_array(){
46
-		return array( 'required'=>true, 'messages' => array( 'required' => $this->get_validation_error_message() ) );
45
+	function get_jquery_validation_rule_array() {
46
+		return array('required'=>true, 'messages' => array('required' => $this->get_validation_error_message()));
47 47
 	}
48 48
 
49 49
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
Please login to merge, or discard this patch.
strategies/validation/EE_Simple_HTML_Validation_Strategy.strategy.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6
11 11
  *
12 12
  */
13
-class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
13
+class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
14 14
 
15 15
 	/**
16 16
 	 * @param null $validation_error_message
17 17
 	 */
18
-	public function __construct( $validation_error_message = NULL ) {
19
-		if( ! $validation_error_message ){
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20 20
 			$allowedtags = $this->_get_allowed_tags();
21
-			$validation_error_message = sprintf( __( "Only simple HTML tags are allowed. Eg, %s", "event_espresso" ), implode( ",", array_keys( $allowedtags ) ) );
21
+			$validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
22 22
 		}
23
-		parent::__construct( $validation_error_message );
23
+		parent::__construct($validation_error_message);
24 24
 	}
25 25
 
26 26
 
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	protected function _get_allowed_tags() {
32 32
 		global $allowedtags;
33
-		$allowedtags[ 'ol' ] = array();
34
-		$allowedtags[ 'ul' ] = array();
35
-		$allowedtags[ 'li' ] = array();
36
-		$allowedtags[ 'br' ] = array();
37
-		$allowedtags[ 'p' ] = array();
33
+		$allowedtags['ol'] = array();
34
+		$allowedtags['ul'] = array();
35
+		$allowedtags['li'] = array();
36
+		$allowedtags['br'] = array();
37
+		$allowedtags['p'] = array();
38 38
 		return $allowedtags;
39 39
 	}
40 40
 
@@ -46,10 +46,10 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function validate($normalized_value) {
48 48
 		$allowedtags = $this->_get_allowed_tags();
49
-		parent::validate( $normalized_value );
50
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value",$allowedtags );
51
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
52
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
49
+		parent::validate($normalized_value);
50
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedtags);
51
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
52
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
53 53
 		}
54 54
 	}
55 55
 }
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
strategies/validation/EE_Validation_Strategy_Base.strategy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @since 				4.6
9 9
  *
10 10
  */
11
-abstract class EE_Validation_Strategy_Base extends EE_Form_Input_Strategy_Base{
11
+abstract class EE_Validation_Strategy_Base extends EE_Form_Input_Strategy_Base {
12 12
 
13 13
 
14 14
 	protected $_validation_error_message = '';
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 	/**
19 19
 	 * @param null $validation_error_message
20 20
 	 */
21
-	public function __construct( $validation_error_message = NULL ) {
22
-		$this->_validation_error_message = $validation_error_message === NULL ? __( 'Input invalid', 'event_espresso' ) : $validation_error_message ;
21
+	public function __construct($validation_error_message = NULL) {
22
+		$this->_validation_error_message = $validation_error_message === NULL ? __('Input invalid', 'event_espresso') : $validation_error_message;
23 23
 		parent::__construct();
24 24
 	}
25 25
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 * @param mixed $normalized_value ready for validation. May very well be NULL (which, unless
35 35
 	 * this validation strategy is the 'required' validation strategy, most should be OK with a null, empty string, etc)
36 36
 	 */
37
-	function validate($normalized_value){
37
+	function validate($normalized_value) {
38 38
 		//by default, the validation strategy does no validation. this should be implemented
39 39
 	}
40 40
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	 *
59 59
 	 * @return array
60 60
 	 */
61
-	function get_jquery_validation_rule_array(){
61
+	function get_jquery_validation_rule_array() {
62 62
 		return array();
63 63
 	}
64 64
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 * the input is invalid. Used for both frontend and backend validation.
68 68
 	 * @return string
69 69
 	 */
70
-	function get_validation_error_message(){
70
+	function get_validation_error_message() {
71 71
 		return $this->_validation_error_message;
72 72
 	}
73 73
 }
74 74
\ No newline at end of file
Please login to merge, or discard this patch.
line_item_display/EE_Admin_Table_Line_Item_Display_Strategy.strategy.php 2 patches
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.