Completed
Branch BUG-5580-mike-implementation (468206)
by
unknown
08:00 queued 1434:13
created
EE_Admin_Table_Registration_Line_Item_Display_Strategy.strategy.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -154,13 +154,13 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
core/libraries/line_item_display/EE_Line_Item_Display.class.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
  /**
3
- *
4
- * Class EE_Line_Item_Display
5
- *
6
- * Description
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    core
10
- * @author				Brent Christensen
11
- * @since		 	   $VID:$
12
- *
13
- */
3
+  *
4
+  * Class EE_Line_Item_Display
5
+  *
6
+  * Description
7
+  *
8
+  * @package         Event Espresso
9
+  * @subpackage    core
10
+  * @author				Brent Christensen
11
+  * @since		 	   $VID:$
12
+  *
13
+  */
14 14
 class EE_Line_Item_Display {
15 15
 
16 16
 	private $strategy = NULL;
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 	 * @param string $context - where/how the line items are being displayed
22 22
 	 * @param string $other_line_item_display_strategy
23 23
 	 */
24
-	public function __construct( $context = '', $other_line_item_display_strategy = '' ) {
25
-		$context = strtolower( $context );
26
-		switch ( $context ) {
24
+	public function __construct($context = '', $other_line_item_display_strategy = '') {
25
+		$context = strtolower($context);
26
+		switch ($context) {
27 27
 			case 'invoice' :
28 28
 				$this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
29 29
 				break;
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 				break;
36 36
 			default :
37 37
 				if (
38
-					! empty( $other_line_item_display_strategy ) &&
39
-					class_exists( $other_line_item_display_strategy )
38
+					! empty($other_line_item_display_strategy) &&
39
+					class_exists($other_line_item_display_strategy)
40 40
 				) {
41 41
 					$this->strategy = new  $other_line_item_display_strategy();
42 42
 				} else {
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 * @param array        $options
51 51
 	 * @return mixed
52 52
 	 */
53
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
54
-		return $this->strategy->display_line_item( $line_item, $options );
53
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
54
+		return $this->strategy->display_line_item($line_item, $options);
55 55
 	}
56 56
 
57 57
 
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Billable_Line_Item_Filter.class.php 1 patch
Spacing   +11 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Billable_Line_Item_Filter
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 	 * EE_Billable_Line_Item_Filter constructor.
26 26
 	 * @param EE_Registration[] $registrations
27 27
 	 */
28
-	public function __construct( $registrations ) {
29
-		parent::__construct( $this->_remove_unbillable_registrations( $registrations ) );
28
+	public function __construct($registrations) {
29
+		parent::__construct($this->_remove_unbillable_registrations($registrations));
30 30
 	}
31 31
 
32 32
 
@@ -39,25 +39,24 @@  discard block
 block discarded – undo
39 39
 	 * @param EE_Registration[] $registrations
40 40
 	 * @return mixed
41 41
 	 */
42
-	protected function _remove_unbillable_registrations( $registrations = array() ) {
43
-		if ( ! empty( $registrations ) ) {
42
+	protected function _remove_unbillable_registrations($registrations = array()) {
43
+		if ( ! empty($registrations)) {
44 44
 			// these reg statuses require payment (if event is not free)
45 45
 			$requires_payment = EEM_Registration::reg_statuses_that_allow_payment();
46
-			foreach ( $registrations as $key => $registration ) {
47
-				if ( ! $registration instanceof EE_Registration ) {
46
+			foreach ($registrations as $key => $registration) {
47
+				if ( ! $registration instanceof EE_Registration) {
48 48
 					continue;
49 49
 				}
50 50
 				// are we billing for this registration at this moment ?
51
-				if ( !
52
-					$registration->owes_monies_and_can_pay( $requires_payment ) &&
51
+				if ( ! $registration->owes_monies_and_can_pay($requires_payment) &&
53 52
 					! (
54 53
 						// free registration with valid reg status
55 54
 						$registration->final_price() == 0 &&
56
-						in_array( $registration->status_ID(), $requires_payment )
55
+						in_array($registration->status_ID(), $requires_payment)
57 56
 					)
58 57
 				) {
59 58
 					// not billable. remove it
60
-					unset( $registrations[ $key ] );
59
+					unset($registrations[$key]);
61 60
 				}
62 61
 			}
63 62
 		}
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Line_Item_Filter_Collection.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Line_Item_Filter_Collection
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Line_Item_Filter_Processor.class.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Line_Item_Filter_Processor
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
 	 * @param \EEI_Line_Item                  $grand_total_line_item
56 56
 	 * @throws \EE_Error
57 57
 	 */
58
-	public function __construct( EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item ) {
58
+	public function __construct(EE_Line_Item_Filter_Collection $line_item_filters, EEI_Line_Item $grand_total_line_item) {
59 59
 		$this->line_item_filters = $line_item_filters;
60
-		if ( $grand_total_line_item->type() !== EEM_Line_Item::type_total ) {
61
-			throw new EE_Error( __( 'A Line Item of the type total is required', 'event_espresso' ) );
60
+		if ($grand_total_line_item->type() !== EEM_Line_Item::type_total) {
61
+			throw new EE_Error(__('A Line Item of the type total is required', 'event_espresso'));
62 62
 		}
63
-		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree( $grand_total_line_item );
63
+		$this->grand_total_line_item = $this->clone_and_reset_line_item_tree($grand_total_line_item);
64 64
 	}
65 65
 
66 66
 
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
71 71
 	 * @param \EEI_Line_Item $line_item
72 72
 	 * @return \EEI_Line_Item
73 73
 	 */
74
-	protected function clone_and_reset_line_item_tree( EEI_Line_Item $line_item ) {
75
-		$cloned_line_item = $this->clone_and_reset_line_item( $line_item );
76
-		foreach ( $line_item->children() as $child_line_item ) {
77
-			$cloned_line_item->add_child_line_item( $this->clone_and_reset_line_item_tree( $child_line_item ) );
74
+	protected function clone_and_reset_line_item_tree(EEI_Line_Item $line_item) {
75
+		$cloned_line_item = $this->clone_and_reset_line_item($line_item);
76
+		foreach ($line_item->children() as $child_line_item) {
77
+			$cloned_line_item->add_child_line_item($this->clone_and_reset_line_item_tree($child_line_item));
78 78
 		}
79 79
 		return $cloned_line_item;
80 80
 	}
@@ -91,16 +91,16 @@  discard block
 block discarded – undo
91 91
 	 * @param \EEI_Line_Item $line_item
92 92
 	 * @return \EEI_Line_Item
93 93
 	 */
94
-	protected function clone_and_reset_line_item( EEI_Line_Item $line_item ) {
94
+	protected function clone_and_reset_line_item(EEI_Line_Item $line_item) {
95 95
 		// we don't actually want to work with the original line item, so clone it
96 96
 		$cloned_line_item = clone $line_item;
97
-		$cloned_line_item->set( 'LIN_ID', null );
98
-		$cloned_line_item->set( 'LIN_parent', null );
97
+		$cloned_line_item->set('LIN_ID', null);
98
+		$cloned_line_item->set('LIN_parent', null);
99 99
 		$cloned_line_item->clear_related_line_item_cache();
100
-		foreach( array_keys( EEM_Line_Item::instance()->relation_settings() ) as $relation_name) {
101
-			$cloned_line_item->clear_cache( $relation_name, null, true );
100
+		foreach (array_keys(EEM_Line_Item::instance()->relation_settings()) as $relation_name) {
101
+			$cloned_line_item->clear_cache($relation_name, null, true);
102 102
 		}
103
-		$cloned_line_item->set_allow_persist( false );
103
+		$cloned_line_item->set_allow_persist(false);
104 104
 		return $cloned_line_item;
105 105
 	}
106 106
 
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public function process() {
115 115
 		$this->line_item_filters->rewind();
116
-		while ( $this->line_item_filters->valid() ) {
117
-			$this->grand_total_line_item = $this->line_item_filters->current()->process( $this->grand_total_line_item );
116
+		while ($this->line_item_filters->valid()) {
117
+			$this->grand_total_line_item = $this->line_item_filters->current()->process($this->grand_total_line_item);
118 118
 			$this->line_item_filters->next();
119 119
 		}
120 120
 		$this->grand_total_line_item->recalculate_total_including_taxes();
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Non_Zero_Line_Item_Filter.class.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Non_Zero_Line_Item_Filter
@@ -31,36 +31,36 @@  discard block
 block discarded – undo
31 31
 	 * @param EEI_Line_Item $line_item
32 32
 	 * @return \EEI_Line_Item
33 33
 	 */
34
-	public function process( EEI_Line_Item $line_item ) {
35
-		$non_zero_line_item = $this->_filter_zero_line_item( $line_item );
36
-		if ( ! $non_zero_line_item instanceof EEI_Line_Item ) {
34
+	public function process(EEI_Line_Item $line_item) {
35
+		$non_zero_line_item = $this->_filter_zero_line_item($line_item);
36
+		if ( ! $non_zero_line_item instanceof EEI_Line_Item) {
37 37
 			return null;
38 38
 		}
39 39
 		//if this is an event subtotal, we want to only include it if it
40 40
 		//has a non-zero total and at least one ticket line item child
41
-		if( $line_item->children() ) {
41
+		if ($line_item->children()) {
42 42
 			$ticket_or_subtotals_with_tkt_children_count = 0;
43
-			foreach ( $line_item->children() as $child_line_item ) {
43
+			foreach ($line_item->children() as $child_line_item) {
44 44
 				$code = $child_line_item->code();
45
-				$child_line_item = $this->process( $child_line_item );
46
-				if( ! $child_line_item instanceof EEI_Line_Item ) {
47
-					$line_item->delete_child_line_item( $code );
45
+				$child_line_item = $this->process($child_line_item);
46
+				if ( ! $child_line_item instanceof EEI_Line_Item) {
47
+					$line_item->delete_child_line_item($code);
48 48
 					continue;
49 49
 				}
50 50
 				if (
51
-					( $child_line_item instanceof EEI_Line_Item &&
51
+					($child_line_item instanceof EEI_Line_Item &&
52 52
 					$child_line_item->type() === EEM_Line_Item::type_line_item &&
53
-					$child_line_item->OBJ_type() === 'Ticket' ) ||
54
-					( $child_line_item instanceof EEI_Line_Item &&
55
-					 $child_line_item->type() === EEM_Line_Item::type_sub_total )
53
+					$child_line_item->OBJ_type() === 'Ticket') ||
54
+					($child_line_item instanceof EEI_Line_Item &&
55
+					 $child_line_item->type() === EEM_Line_Item::type_sub_total)
56 56
 				) {
57 57
 					$ticket_or_subtotals_with_tkt_children_count++;
58 58
 				}
59 59
 			}
60 60
 			// if this is an event subtotal with NO ticket children
61 61
 			// we basically want to ignore it
62
-			return $this->_filter_zero_subtotal_line_item( $non_zero_line_item, $ticket_or_subtotals_with_tkt_children_count );
63
-		}else{
62
+			return $this->_filter_zero_subtotal_line_item($non_zero_line_item, $ticket_or_subtotals_with_tkt_children_count);
63
+		} else {
64 64
 			return $non_zero_line_item;
65 65
 		}
66 66
 	}
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 * @param EEI_Line_Item $line_item
74 74
 	 * @return EEI_Line_Item
75 75
 	 */
76
-	protected function _filter_zero_line_item( EEI_Line_Item $line_item ) {
76
+	protected function _filter_zero_line_item(EEI_Line_Item $line_item) {
77 77
 		if (
78 78
 			$line_item->type() === EEM_Line_Item::type_line_item &&
79 79
 			$line_item->OBJ_type() === 'Ticket' &&
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @param int           $ticket_children
94 94
 	 * @return \EEI_Line_Item
95 95
 	 */
96
-	protected function _filter_zero_subtotal_line_item( EEI_Line_Item $line_item, $ticket_children = 0 ) {
96
+	protected function _filter_zero_subtotal_line_item(EEI_Line_Item $line_item, $ticket_children = 0) {
97 97
 		if (
98 98
 			$line_item->type() === EEM_Line_Item::type_sub_total &&
99 99
 			$ticket_children === 0
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.
line_item_filters/EE_Specific_Registrations_Line_Item_Filter.class.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@
 block discarded – undo
18 18
  */
19 19
 class EE_Specific_Registrations_Line_Item_Filter extends EE_Line_Item_Filter_Base {
20 20
 /**
21
-	 * array of line item codes and their corresponding quantities for
22
-	 * registrations that owe money and can pay at this moment
23
-	 * @type array $_counts_per_line_item_code
24
-	 */
21
+ * array of line item codes and their corresponding quantities for
22
+ * registrations that owe money and can pay at this moment
23
+ * @type array $_counts_per_line_item_code
24
+ */
25 25
 	protected $_counts_per_line_item_code = array();
26 26
 
27 27
 	/**
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
 	 * EE_Billable_Line_Item_Filter constructor.
37 37
 	 * @param EE_Registration[] $registrations
38 38
 	 */
39
-	public function __construct( $registrations ) {
39
+	public function __construct($registrations) {
40 40
 		$this->_registrations = $registrations;
41
-		$this->_calculate_counts_per_line_item_code( $registrations );
41
+		$this->_calculate_counts_per_line_item_code($registrations);
42 42
 	}
43 43
 
44 44
 	/**
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 	 * @param EE_Registration[] $registrations
47 47
 	 * @return void
48 48
 	 */
49
-	protected function _calculate_counts_per_line_item_code( $registrations ) {
50
-		foreach( $registrations as $registration ) {
51
-			$line_item_code = EEM_Line_Item::instance()->get_var( EEM_Line_Item::instance()->line_item_for_registration_query_params( $registration, array( 'limit' => 1 ) ), 'LIN_code' );
52
-			if( $line_item_code ) {
53
-				if( ! isset( $this->_counts_per_line_item_code[ $line_item_code ] ) ) {
54
-					$this->_counts_per_line_item_code[ $line_item_code ] = 1;
55
-				}else{
56
-					$this->_counts_per_line_item_code[ $line_item_code ]++;
49
+	protected function _calculate_counts_per_line_item_code($registrations) {
50
+		foreach ($registrations as $registration) {
51
+			$line_item_code = EEM_Line_Item::instance()->get_var(EEM_Line_Item::instance()->line_item_for_registration_query_params($registration, array('limit' => 1)), 'LIN_code');
52
+			if ($line_item_code) {
53
+				if ( ! isset($this->_counts_per_line_item_code[$line_item_code])) {
54
+					$this->_counts_per_line_item_code[$line_item_code] = 1;
55
+				} else {
56
+					$this->_counts_per_line_item_code[$line_item_code]++;
57 57
 				}
58 58
 			}
59 59
 		}
@@ -69,18 +69,18 @@  discard block
 block discarded – undo
69 69
 	 * @param EEI_Line_Item $line_item
70 70
 	 * @return EEI_Line_Item
71 71
 	 */
72
-	protected function _adjust_line_item_quantity( EEI_Line_Item $line_item ) {
72
+	protected function _adjust_line_item_quantity(EEI_Line_Item $line_item) {
73 73
 		// is this a ticket ?
74
-		if ( $line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket' ) {
74
+		if ($line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket') {
75 75
 			// if this ticket is billable at this moment, then we should have a positive quantity
76
-			if ( isset( $this->_counts_per_line_item_code[ $line_item->code() ] )) {
76
+			if (isset($this->_counts_per_line_item_code[$line_item->code()])) {
77 77
 				// set quantity based on number of billable registrations for this ticket
78
-				$quantity = $this->_counts_per_line_item_code[ $line_item->code() ];
78
+				$quantity = $this->_counts_per_line_item_code[$line_item->code()];
79 79
 			} else {
80 80
 				$quantity = 0;
81 81
 			}
82
-			$line_item->set_quantity( $quantity );
83
-			$line_item->set_total( $line_item->unit_price() * $line_item->quantity() );
82
+			$line_item->set_quantity($quantity);
83
+			$line_item->set_total($line_item->unit_price() * $line_item->quantity());
84 84
 		}
85 85
 		return $line_item;
86 86
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -459,7 +459,7 @@
 block discarded – undo
459 459
 				//must be explicit because schema could equal true.
460 460
 				if( $schema === 'no_html' ){
461 461
 					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
462
-				}else{
462
+				} else{
463 463
 					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
464 464
 				}
465 465
 			} else {
Please login to merge, or discard this patch.
core/libraries/messages/EE_Messages_Base.lib.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -185,14 +185,14 @@  discard block
 block discarded – undo
185 185
 	 * @access protected
186 186
 	 * @return void
187 187
 	 */
188
-	protected function _set_existing_admin_settings( $messenger = NULL ) {
188
+	protected function _set_existing_admin_settings($messenger = NULL) {
189 189
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
190
-		$active_message_types = !empty( $messenger ) ? $active_messengers[$messenger]['settings'][$messenger . '-message_types'] : array();
190
+		$active_message_types = ! empty($messenger) ? $active_messengers[$messenger]['settings'][$messenger.'-message_types'] : array();
191 191
 
192 192
 
193 193
 		$actives = $this->_messages_item_type == 'messenger' ? $active_messengers : $active_message_types;
194 194
 
195
-		$this->_existing_admin_settings = isset($actives[$this->name]['settings'] ) ? $actives[$this->name]['settings'] : null;
195
+		$this->_existing_admin_settings = isset($actives[$this->name]['settings']) ? $actives[$this->name]['settings'] : null;
196 196
 	}
197 197
 
198 198
 
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
 	 * @access public
208 208
 	 * @return array          settings
209 209
 	 */
210
-	public function get_existing_admin_settings( $messenger = NULL ) {
210
+	public function get_existing_admin_settings($messenger = NULL) {
211 211
 		// if admin_settings property empty lets try setting it.
212
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) )
213
-			$this->_set_existing_admin_settings( $messenger );
212
+		if (method_exists($this, '_set_existing_admin_settings') && empty($this->_existing_admin_settings))
213
+			$this->_set_existing_admin_settings($messenger);
214 214
 
215 215
 		return EEH_Class_Tools::has_property($this, '_existing_admin_settings') ? $this->_existing_admin_settings : null;
216 216
 	}
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
 	 * @return array   an array of valid shortcodes.
226 226
 	 */
227 227
 	public function get_valid_shortcodes() {
228
-		$valid_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__get_valid_shortcodes', $this->_valid_shortcodes, $this );
228
+		$valid_shortcodes = apply_filters('FHEE__'.get_class($this).'__get_valid_shortcodes', $this->_valid_shortcodes, $this);
229 229
 
230 230
 		//The below filter applies to ALL messengers and message types so use with care!
231
-		$valid_shortcodes = apply_filters( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this );
231
+		$valid_shortcodes = apply_filters('FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this);
232 232
 		return $valid_shortcodes;
233 233
 	}
234 234
 
@@ -259,17 +259,17 @@  discard block
 block discarded – undo
259 259
 	 * @access protected
260 260
 	 * @return string $content for page.
261 261
 	 */
262
-	protected function _get_admin_page_content( $page, $action, $extra, $actives ) {
262
+	protected function _get_admin_page_content($page, $action, $extra, $actives) {
263 263
 		//we can also further refine the context by action (if present).
264
-		if ( !empty($action) ) {
265
-			$page = $page . '_' . $action;
264
+		if ( ! empty($action)) {
265
+			$page = $page.'_'.$action;
266 266
 		}
267 267
 
268
-		if ( !isset( $this->admin_registered_pages[$page]) )
268
+		if ( ! isset($this->admin_registered_pages[$page]))
269 269
 			return false; //todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
270 270
 
271 271
 		//k made it here so let's call the method
272
-		if ( FALSE === ( $content = call_user_func_array( array( $this, '_get_admin_content_' . $page), array($actives, $extra) ) ) ) {
272
+		if (FALSE === ($content = call_user_func_array(array($this, '_get_admin_content_'.$page), array($actives, $extra)))) {
273 273
 			return false; //todo this needs to be an exception once we've got exceptions in place.
274 274
 		}
275 275
 		return $content;
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
@@ -209,8 +210,9 @@  discard block
 block discarded – undo
209 210
 	 */
210 211
 	public function get_existing_admin_settings( $messenger = NULL ) {
211 212
 		// if admin_settings property empty lets try setting it.
212
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) )
213
-			$this->_set_existing_admin_settings( $messenger );
213
+		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) ) {
214
+					$this->_set_existing_admin_settings( $messenger );
215
+		}
214 216
 
215 217
 		return EEH_Class_Tools::has_property($this, '_existing_admin_settings') ? $this->_existing_admin_settings : null;
216 218
 	}
@@ -265,8 +267,10 @@  discard block
 block discarded – undo
265 267
 			$page = $page . '_' . $action;
266 268
 		}
267 269
 
268
-		if ( !isset( $this->admin_registered_pages[$page]) )
269
-			return false; //todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
270
+		if ( !isset( $this->admin_registered_pages[$page]) ) {
271
+					return false;
272
+		}
273
+		//todo: a place to throw an exception?  We need to indicate there is no registered page so this function is not being called correctly.
270 274
 
271 275
 		//k made it here so let's call the method
272 276
 		if ( FALSE === ( $content = call_user_func_array( array( $this, '_get_admin_content_' . $page), array($actives, $extra) ) ) ) {
Please login to merge, or discard this patch.
core/libraries/messages/EE_Payment_Base_message_type.lib.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -39,31 +39,31 @@  discard block
 block discarded – undo
39 39
 
40 40
 
41 41
 
42
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
42
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
43 43
 
44 44
 		//use the registration to get the transaction.
45 45
 		$transaction = $registration->transaction();
46 46
 
47 47
 		//bail early if no transaction
48
-		if ( ! $transaction instanceof EE_Transaction ) {
49
-			throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
48
+		if ( ! $transaction instanceof EE_Transaction) {
49
+			throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
50 50
 		}
51 51
 
52
-		$payment = ! empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
52
+		$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
53 53
 
54
-		return array( $transaction, $payment );
54
+		return array($transaction, $payment);
55 55
 	}
56 56
 
57 57
 
58 58
 
59 59
 
60 60
 
61
-	protected function _get_id_for_msg_url( $context, EE_Registration $registration ) {
61
+	protected function _get_id_for_msg_url($context, EE_Registration $registration) {
62 62
 		//there should be a transaction and payment object in the incoming data.
63
-		if ( $this->_data instanceof EE_Messages_incoming_data  ) {
64
-			$payment = !empty( $this->_data->payment ) ? $this->_data->payment : NULL;
63
+		if ($this->_data instanceof EE_Messages_incoming_data) {
64
+			$payment = ! empty($this->_data->payment) ? $this->_data->payment : NULL;
65 65
 
66
-			if ( $payment instanceof EE_Payment ) {
66
+			if ($payment instanceof EE_Payment) {
67 67
 				return $payment->ID();
68 68
 			}
69 69
 		}
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 
73 73
 
74 74
 
75
-	protected function _get_admin_content_events_edit_for_messenger( EE_Messenger $messenger ) {
75
+	protected function _get_admin_content_events_edit_for_messenger(EE_Messenger $messenger) {
76 76
 		//this is just a test
77
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
77
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
78 78
 	}
79 79
 
80 80
 	/**
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
  * @subpackage plugin api, messages
6 6
  * @since           4.5.0
7 7
  */
8
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
8
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
9
+	exit('No direct script access allowed');
10
+}
9 11
 
10 12
 /**
11 13
  * Use this to register or deregister a new message template pack variation for the EE messages system.
Please login to merge, or discard this patch.