Completed
Branch FET-7999-purchasing-agent (117637)
by
unknown
473:24 queued 459:58
created
templates/txn_admin_details_main_meta_box_txn_details.template.php 2 patches
Spacing   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
2 2
 
3 3
 	<h4 class="admin-primary-mbox-h4 hdr-has-icon">
4
-		<span class="dashicons dashicons-cart"></span><?php _e( 'Transaction Items', 'event_espresso' );?>
4
+		<span class="dashicons dashicons-cart"></span><?php _e('Transaction Items', 'event_espresso'); ?>
5 5
 	</h4>
6 6
 
7 7
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -10,27 +10,27 @@  discard block
 block discarded – undo
10 10
 	</div>
11 11
 
12 12
 	<a id="display-additional-transaction-session-info" class="display-the-hidden smaller-text" rel="additional-transaction-session-info">
13
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional transaction session details', 'event_espresso' );?>
13
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional transaction session details', 'event_espresso'); ?>
14 14
 	</a>
15 15
 
16 16
 	<div id="additional-transaction-session-info-dv" class="hidden">
17 17
 
18 18
 		<a id="hide-additional-transaction-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-transaction-session-info">
19
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional transaction session details', 'event_espresso' );?>
19
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional transaction session details', 'event_espresso'); ?>
20 20
 		</a>
21 21
 	<br class="clear"/>
22 22
 
23
-		<h4 class="admin-primary-mbox-h4"><?php _e( 'Transaction Session Details', 'event_espresso' );?></h4>
23
+		<h4 class="admin-primary-mbox-h4"><?php _e('Transaction Session Details', 'event_espresso'); ?></h4>
24 24
 
25 25
 		<table id="admin-primary-mbox-txn-extra-session-info-tbl" class="form-table skinny-rows">
26 26
 			<tbody>
27
-			<?php foreach ( $txn_details as $key => $txn_detail ) : ?>
27
+			<?php foreach ($txn_details as $key => $txn_detail) : ?>
28 28
 				<tr>
29 29
 					<th>
30
-						<label for="<?php echo $key;?>"><?php echo $txn_detail['label'];?></label>
30
+						<label for="<?php echo $key; ?>"><?php echo $txn_detail['label']; ?></label>
31 31
 					</th>
32 32
 					<td>
33
-						<?php echo $txn_detail['value'];?>
33
+						<?php echo $txn_detail['value']; ?>
34 34
 					</td>
35 35
 				</tr>
36 36
 			<?php endforeach; // $txn_details?>
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 	<br class="clear"/>
41 41
 
42 42
 
43
-	<?php if ( $attendee instanceof EE_Attendee && ( $grand_raw_total > 0 || $TXN_status != 'TCM' ) ) : ?>
43
+	<?php if ($attendee instanceof EE_Attendee && ($grand_raw_total > 0 || $TXN_status != 'TCM')) : ?>
44 44
 
45 45
 	<h4 class="admin-primary-mbox-h4 hdr-has-icon">
46
-		<span class="ee-icon ee-icon-cash"></span><?php _e( 'Payment Details', 'event_espresso' );?>
46
+		<span class="ee-icon ee-icon-cash"></span><?php _e('Payment Details', 'event_espresso'); ?>
47 47
 	</h4>
48 48
 
49 49
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -52,75 +52,75 @@  discard block
 block discarded – undo
52 52
 				<tr>
53 53
 					<th></th>
54 54
 					<th class="jst-cntr"></th>
55
-					<th class="jst-cntr"><?php _e( 'ID', 'event_espresso' );?></th>
56
-					<th class="jst-left"><?php _e( 'Date', 'event_espresso' );?></th>
57
-					<th class="jst-cntr"><?php _e( 'Source', 'event_espresso' );?></th>
58
-					<th class="jst-left"><?php _e( 'Method', 'event_espresso' );?></th>
59
-					<th class="jst-left"><?php _e( 'Gateway Response', 'event_espresso' );?></th>
60
-					<th class="jst-left"><?php _e( 'TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso' );?></th>
61
-					<th class="jst-left"><?php _e( 'P.O. / S.O.&nbsp;#', 'event_espresso' );?></th>
62
-					<th class="jst-left"><?php _e( 'Notes / Extra&nbsp;Accounting', 'event_espresso' );?></th>
63
-					<!--<th class="jst-left"><?php _e( 'Details', 'event_espresso' );?></th>-->
64
-					<th class="jst-cntr"><?php _e( 'Amount', 'event_espresso' );?></th>
55
+					<th class="jst-cntr"><?php _e('ID', 'event_espresso'); ?></th>
56
+					<th class="jst-left"><?php _e('Date', 'event_espresso'); ?></th>
57
+					<th class="jst-cntr"><?php _e('Source', 'event_espresso'); ?></th>
58
+					<th class="jst-left"><?php _e('Method', 'event_espresso'); ?></th>
59
+					<th class="jst-left"><?php _e('Gateway Response', 'event_espresso'); ?></th>
60
+					<th class="jst-left"><?php _e('TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso'); ?></th>
61
+					<th class="jst-left"><?php _e('P.O. / S.O.&nbsp;#', 'event_espresso'); ?></th>
62
+					<th class="jst-left"><?php _e('Notes / Extra&nbsp;Accounting', 'event_espresso'); ?></th>
63
+					<!--<th class="jst-left"><?php _e('Details', 'event_espresso'); ?></th>-->
64
+					<th class="jst-cntr"><?php _e('Amount', 'event_espresso'); ?></th>
65 65
 				</tr>
66 66
 			</thead>
67 67
 			<tbody>
68
-		<?php if ( $payments ) : ?>
68
+		<?php if ($payments) : ?>
69 69
 			<?php $payment_total = 0; ?>
70
-			<?php foreach ( $payments as $PAY_ID => $payment ) : ?>
71
-				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID;?>">
70
+			<?php foreach ($payments as $PAY_ID => $payment) : ?>
71
+				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID; ?>">
72 72
 					<td>
73 73
 						<span id="payment-status-<?php echo $PAY_ID; ?>" class="ee-status-strip-td ee-status-strip pymt-status-<?php echo $payment->STS_ID(); ?>"></span>
74
-						<div id="payment-STS_ID-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->STS_ID();?></div>
75
-						<div id="reg-payments-<?php echo $PAY_ID;?>" class="hidden"><?php echo json_encode( $existing_reg_payments[ $PAY_ID ] );?></div>
74
+						<div id="payment-STS_ID-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->STS_ID(); ?></div>
75
+						<div id="reg-payments-<?php echo $PAY_ID; ?>" class="hidden"><?php echo json_encode($existing_reg_payments[$PAY_ID]); ?></div>
76 76
 					</td>
77 77
 					<td class=" jst-cntr">
78 78
 						<ul class="txn-overview-actions-ul">
79 79
 							<li>
80
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
80
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
81 81
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
82 82
 								</a>
83 83
 							</li>
84 84
 							<li>
85
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
85
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
86 86
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
87 87
 								</a>
88 88
 							</li>
89 89
 						</ul>
90 90
 					</td>
91 91
 					<td class=" jst-rght">
92
-						<div id="payment-id-<?php echo $PAY_ID;?>"><?php echo $PAY_ID;?></div>
92
+						<div id="payment-id-<?php echo $PAY_ID; ?>"><?php echo $PAY_ID; ?></div>
93 93
 					</td>
94 94
 					<td class=" jst-left">
95
-						<div id="payment-date-<?php echo $PAY_ID;?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'h:i a');?></div>
95
+						<div id="payment-date-<?php echo $PAY_ID; ?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'h:i a'); ?></div>
96 96
 					</td>
97 97
 					<td class=" jst-cntr">
98
-						<div id="payment-method-<?php echo $PAY_ID;?>">
99
-							<?php echo $payment->source();?>
98
+						<div id="payment-method-<?php echo $PAY_ID; ?>">
99
+							<?php echo $payment->source(); ?>
100 100
 						</div>
101 101
 					</td>
102 102
 					<td class=" jst-left">
103
-						<div id="payment-gateway-<?php echo $PAY_ID;?>">
104
-							<?php echo $payment->payment_method() ?  $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso');?>
103
+						<div id="payment-gateway-<?php echo $PAY_ID; ?>">
104
+							<?php echo $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'); ?>
105 105
 						</div>
106
-						<div id="payment-gateway-id-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0;?></div>
106
+						<div id="payment-gateway-id-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0; ?></div>
107 107
 					</td>
108 108
 					<td class=" jst-left">
109
-						<div id="payment-response-<?php echo $PAY_ID;?>"><?php echo $payment->gateway_response();?></div>
109
+						<div id="payment-response-<?php echo $PAY_ID; ?>"><?php echo $payment->gateway_response(); ?></div>
110 110
 					</td>
111 111
 					<td class=" jst-left">
112
-						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->txn_id_chq_nmbr();?></div>
112
+						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->txn_id_chq_nmbr(); ?></div>
113 113
 					</td>
114 114
 					<td class=" jst-left">
115
-						<div id="payment-po-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->po_number();?></div>
115
+						<div id="payment-po-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->po_number(); ?></div>
116 116
 					</td>
117 117
 					<td class=" jst-left">
118
-						<div id="payment-accntng-<?php echo $PAY_ID;?>"><?php echo $payment->extra_accntng();?></div>
118
+						<div id="payment-accntng-<?php echo $PAY_ID; ?>"><?php echo $payment->extra_accntng(); ?></div>
119 119
 					</td>
120 120
 					<td class=" jst-rght">
121
-						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-' . $payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
122
-						<span class="<?php echo $payment_class;?>">
123
-							<div id="payment-amount-<?php echo $PAY_ID;?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE ); ?></div>
121
+						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-'.$payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
122
+						<span class="<?php echo $payment_class; ?>">
123
+							<div id="payment-amount-<?php echo $PAY_ID; ?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE); ?></div>
124 124
 						</span>
125 125
 					</td>
126 126
 				</tr>
@@ -130,25 +130,25 @@  discard block
 block discarded – undo
130 130
 			<?php endforeach; // $payment?>
131 131
 			<?php
132 132
 				$pay_totals_class = $payment_total > $grand_raw_total ? ' important-notice' : '';
133
-				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">' . __( 'This transaction has been overpaid ! ', 'event_espresso' ) . '</span>' : '';
133
+				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">'.__('This transaction has been overpaid ! ', 'event_espresso').'</span>' : '';
134 134
 			?>
135 135
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
136 136
 					<td class=" jst-rght" colspan="11">
137
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
137
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
138 138
 					</td>
139 139
 				</tr>
140
-				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class;?>">
141
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid . sprintf( __( 'Payments Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );?></span></th>
142
-					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE);?></span></th>
140
+				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class; ?>">
141
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid.sprintf(__('Payments Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); ?></span></th>
142
+					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE); ?></span></th>
143 143
 				</tr>
144 144
 		<?php else : ?>
145 145
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
146 146
 					<td class=" jst-rght" colspan="11">
147
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
147
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
148 148
 					</td>
149 149
 				</tr>
150 150
 				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
151
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __( 'Payments Total', 'event_espresso' );?></span></th>
151
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __('Payments Total', 'event_espresso'); ?></span></th>
152 152
 					<th class=" jst-rght"><span id="txn-admin-payment-total"></span></th>
153 153
 				</tr>
154 154
 		<?php endif; // $payments?>
@@ -161,12 +161,12 @@  discard block
 block discarded – undo
161 161
 					<td class=" jst-cntr">
162 162
 						<ul class="txn-overview-actions-ul">
163 163
 							<li>
164
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
164
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
165 165
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
166 166
 								</a>
167 167
 							</li>
168 168
 							<li>
169
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
169
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
170 170
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
171 171
 								</a>
172 172
 							</li>
@@ -213,12 +213,12 @@  discard block
 block discarded – undo
213 213
 	<ul id="txn-admin-payment-options-ul">
214 214
 		<li>
215 215
 			<a id="display-txn-admin-apply-payment" class="button-primary no-icon no-hide" rel="txn-admin-apply-payment" > <!--display-the-hidden -->
216
-				<?php _e( 'Apply Payment', 'event_espresso' );?>
216
+				<?php _e('Apply Payment', 'event_espresso'); ?>
217 217
 			</a>
218 218
 		</li>
219 219
 		<li>
220 220
 			<a id="display-txn-admin-apply-refund" class="button-secondary no-icon no-hide" rel="txn-admin-apply-refund" >  <!--display-the-hidden -->
221
-				<?php _e( 'Apply Refund', 'event_espresso' );?>
221
+				<?php _e('Apply Refund', 'event_espresso'); ?>
222 222
 			</a>
223 223
 		</li>
224 224
 	</ul>
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
228 228
 
229 229
 		<h2 id="admin-modal-dialog-apply-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
230 230
 			<div class="ee-icon ee-icon-cash-add float-left"></div>
231
-			<?php echo __( 'Apply a Payment to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
231
+			<?php echo __('Apply a Payment to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
232 232
 		</h2>
233 233
 
234 234
 		<h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
235 235
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
236 236
 			<?php
237 237
 			echo sprintf(
238
-				__( 'Edit Payment #%s for Transaction #%s', 'event_espresso' ),
238
+				__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
239 239
 				'<span></span>',
240 240
 				$txn_nmbr['value']
241 241
 			);
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
247 247
 			<?php
248 248
 			echo sprintf(
249
-				__( 'Edit Refund #%s for Transaction #%s', 'event_espresso' ),
249
+				__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
250 250
 				'<span></span>',
251 251
 				$txn_nmbr['value']
252 252
 			);
@@ -255,14 +255,14 @@  discard block
 block discarded – undo
255 255
 
256 256
 		<h2 id="admin-modal-dialog-apply-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
257 257
 			<div class="ee-icon ee-icon-cash-remove float-left"></div>
258
-			<?php echo __( 'Apply a Refund to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
258
+			<?php echo __('Apply a Refund to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
259 259
 		</h2>
260 260
 
261 261
 		<form name="txn-admin-apply-payment-frm" id="txn-admin-apply-payment-frm" action="<?php echo $apply_payment_form_url; ?>">
262 262
 			<div class="admin-modal-dialog-wrap">
263 263
 				<div class="admin-modal-dialog-inner">
264 264
 
265
-					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_apply_payment_nonce' );?>"/>
265
+					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce('espresso_apply_payment_nonce'); ?>"/>
266 266
 					<input  type="hidden" name="espresso_ajax" id="espresso-ajax" value="0"/>
267 267
 					<input  type="hidden" name="noheader" id="txn-admin-noheader-inp" value="0"/>
268 268
 					<input  type="hidden" name="txn_admin_payment[PAY_ID]" id="txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
@@ -270,99 +270,99 @@  discard block
 block discarded – undo
270 270
 					<input  type="hidden" name="txn_admin_payment[type]" id="txn-admin-payment-type-inp" value="1"/>
271 271
 					<input  type="hidden" name="txn_admin_payment[details]" id="txn-admin-payment-details-inp" value=""/>
272 272
 					<input  type="hidden" name="txn_admin_delete_payment_form_url" id="txn-admin-delete-payment-form-url-inp" value="<?php echo $delete_payment_form_url; ?>"/>
273
-					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date( 'Y-m-d h:i a', current_time( 'timestamp' )); ?>"/>
273
+					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date('Y-m-d h:i a', current_time('timestamp')); ?>"/>
274 274
 
275 275
 					<div class="txn-admin-apply-payment-date-dv admin-modal-dialog-row">
276
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
277
-						<label for="txn-admin-payment-date-inp" class=""><?php _e( 'Payment Date', 'event_espresso' );?></label>
278
-						<input name="txn_admin_payment[date]" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date( 'Y-m-d h:i a', current_time( 'timestamp' )); ?>"/>
279
-						<p class="description"><?php _e( 'The date the payment was actually made on', 'event_espresso' );?></p>
276
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
277
+						<label for="txn-admin-payment-date-inp" class=""><?php _e('Payment Date', 'event_espresso'); ?></label>
278
+						<input name="txn_admin_payment[date]" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date('Y-m-d h:i a', current_time('timestamp')); ?>"/>
279
+						<p class="description"><?php _e('The date the payment was actually made on', 'event_espresso'); ?></p>
280 280
 					</div>
281 281
 
282 282
 					<div class="txn-admin-apply-payment-amount-dv admin-modal-dialog-row">
283
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
284
-						<label for="txn-admin-payment-amount-inp" class=""><?php _e( 'Amount', 'event_espresso' );?></label>
283
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
284
+						<label for="txn-admin-payment-amount-inp" class=""><?php _e('Amount', 'event_espresso'); ?></label>
285 285
 						<input name="txn_admin_payment[amount]" id="txn-admin-payment-amount-inp" class="txn-admin-apply-payment-inp required" type="text" value=""/>
286
-						<p class="description"><?php _e( 'The amount of the payment', 'event_espresso' );?></p>
286
+						<p class="description"><?php _e('The amount of the payment', 'event_espresso'); ?></p>
287 287
 					</div>
288 288
 
289 289
 					<div class="txn-admin-apply-payment-method-dv admin-modal-dialog-row">
290
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
291
-						<label for="txn-admin-payment-method-inp" class=""><?php _e( 'Method of Payment', 'event_espresso' );?></label>
290
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
291
+						<label for="txn-admin-payment-method-inp" class=""><?php _e('Method of Payment', 'event_espresso'); ?></label>
292 292
 						<select name="txn_admin_payment[PMD_ID]" id="txn-admin-payment-method-slct" class="txn-admin-apply-payment-slct required" type="text" >
293
-						<?php foreach ( $payment_methods as $method ) : ?>
293
+						<?php foreach ($payment_methods as $method) : ?>
294 294
 							<?php $selected = $method->slug() == 'cash' ? ' selected="selected"' : ''; ?>
295
-							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key( $method->admin_desc() ) ? substr( $method->admin_desc(), 0, 128) : $method->admin_name() ; ?>&nbsp;&nbsp;</option>
295
+							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key($method->admin_desc()) ? substr($method->admin_desc(), 0, 128) : $method->admin_name(); ?>&nbsp;&nbsp;</option>
296 296
 						<?php endforeach; ?>
297 297
 						</select>
298
-						<p class="description"><?php _e( 'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso' );?></p>
298
+						<p class="description"><?php _e('Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso'); ?></p>
299 299
 					</div>
300 300
 
301 301
 					<div class="mop-PP mop-CC mop-CHQ mop">
302 302
 						<div class="txn-admin-apply-payment-gw-txn-id-dv admin-modal-dialog-row">
303
-							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e( 'TXN ID / CHQ #', 'event_espresso' );?></label>
303
+							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e('TXN ID / CHQ #', 'event_espresso'); ?></label>
304 304
 							<input name="txn_admin_payment[txn_id_chq_nmbr]" id="txn-admin-payment-txn-id-chq-nmbr-inp" class="txn-admin-apply-payment-inp" type="text"/>
305
-							<p class="description"><?php _e( 'The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso' );?></p>
305
+							<p class="description"><?php _e('The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso'); ?></p>
306 306
 						</div>
307 307
 					</div>
308 308
 
309 309
 					<div class="mop-CC mop" style="display:none">
310 310
 						<div class="txn-admin-apply-payment-response-dv admin-modal-dialog-row">
311
-							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e( 'Gateway Response', 'event_espresso' );?></label>
311
+							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e('Gateway Response', 'event_espresso'); ?></label>
312 312
 							<input name="txn_admin_payment[gateway_response]" id="txn-admin-payment-gateway-response-inp" class="txn-admin-apply-payment-inp" type="text"/>
313
-							<p class="description"><?php _e( 'The gateway response string (optional)', 'event_espresso' );?></p>
313
+							<p class="description"><?php _e('The gateway response string (optional)', 'event_espresso'); ?></p>
314 314
 						</div>
315 315
 					</div>
316 316
 
317 317
 					<div class="mop-PP mop-CC mop">
318 318
 						<div class="txn-admin-apply-payment-status-dv admin-modal-dialog-row">
319
-							<label for="txn-admin-payment-status-inp" class=""><?php _e( 'Payment Status', 'event_espresso' );?></label>
319
+							<label for="txn-admin-payment-status-inp" class=""><?php _e('Payment Status', 'event_espresso'); ?></label>
320 320
 							<select name="txn_admin_payment[status]" id="txn-admin-payment-status-slct" class="txn-admin-apply-payment-slct" type="text" >
321
-							<?php foreach ( $payment_status as $STS_ID => $STS_code ) : ?>
321
+							<?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
322 322
 								<?php $selected = $STS_ID == 'PAP' ? ' selected="selected"' : ''; ?>
323 323
 								<option id="payment-status-opt-<?php echo $STS_ID; ?>" value="<?php echo $STS_ID; ?>"<?php echo $selected; ?>><?php echo $STS_code; ?>&nbsp;&nbsp;</option>
324 324
 							<?php endforeach; ?>
325 325
 							</select>
326
-							<p class="description"><?php _e( 'Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso' );?></p>
326
+							<p class="description"><?php _e('Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso'); ?></p>
327 327
 						</div>
328 328
 					</div>
329 329
 
330 330
 					<div class="txn-admin-apply-payment-po-nmbr-dv admin-modal-dialog-row">
331
-						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e( 'P.O. / S.O. #', 'event_espresso' );?></label>
331
+						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e('P.O. / S.O. #', 'event_espresso'); ?></label>
332 332
 						<input name="txn_admin_payment[po_number]" id="txn-admin-payment-po-nmbr-inp" class="txn-admin-apply-payment-inp" type="text"/>
333
-						<p class="description"><?php _e( 'The Purchase or Sales Order Number if any (optional)', 'event_espresso' );?></p>
333
+						<p class="description"><?php _e('The Purchase or Sales Order Number if any (optional)', 'event_espresso'); ?></p>
334 334
 					</div>
335 335
 
336 336
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
337
-						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e( 'Notes / Extra Accounting', 'event_espresso' );?></label>
337
+						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e('Notes / Extra Accounting', 'event_espresso'); ?></label>
338 338
 						<input name="txn_admin_payment[accounting]" id="txn-admin-payment-accounting-inp" class="txn-admin-apply-payment-inp" type="text" value="<?php echo $REG_code; ?>"/>		<input type="hidden" id="txn-admin-reg-code-inp" value="<?php echo $REG_code; ?>"/>
339
-						<p class="description"><?php _e( 'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso' );?></p>
339
+						<p class="description"><?php _e('An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso'); ?></p>
340 340
 					</div>
341 341
 
342 342
 					<div class="txn-admin-apply-payment-registrations-dv admin-modal-dialog-row">
343
-						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e( 'Registrations to Apply Payment to:', 'event_espresso' ); ?></label>
343
+						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e('Registrations to Apply Payment to:', 'event_espresso'); ?></label>
344 344
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
345 345
 							<input type="radio" value="1" id="txn-admin-apply-payment-to-all-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]"  checked="checked"/>
346
-							<?php _e( 'ALL Registrations', 'event_espresso' ); ?>
346
+							<?php _e('ALL Registrations', 'event_espresso'); ?>
347 347
 						</label>
348 348
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
349 349
 							<input type="radio" value="0" id="txn-admin-apply-payment-to-some-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]" />
350
-							<?php _e( 'Just the following Registrations', 'event_espresso' ); ?>
350
+							<?php _e('Just the following Registrations', 'event_espresso'); ?>
351 351
 						</label>
352 352
 						<?php echo $registrations_to_apply_payment_to; ?>
353 353
 					</div>
354 354
 
355 355
 					<div class="txn-admin-payment-reg-status-dv admin-modal-dialog-row">
356
-						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
356
+						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
357 357
 						<?php echo $status_change_select; ?>
358
-						<p class="description"><?php _e( 'If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso' ); ?></p>
358
+						<p class="description"><?php _e('If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso'); ?></p>
359 359
 						<br/>
360 360
 					</div>
361 361
 
362 362
 					<div class="txn-admin-apply-payment-send-notifications-dv admin-modal-dialog-row">
363
-						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
363
+						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
364 364
 						<input type="checkbox" value="1" name="txn_reg_status_change[send_notifications]">
365
-						<p class="description"><?php printf( __('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check this box, the system will also send any related messages matching the status of the registrations to %1$search registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />' ); ?></p>
365
+						<p class="description"><?php printf(__('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check this box, the system will also send any related messages matching the status of the registrations to %1$search registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />'); ?></p>
366 366
 						<label></label>
367 367
 					</div>
368 368
 					<div class="clear"></div>
@@ -373,27 +373,27 @@  discard block
 block discarded – undo
373 373
 			<ul id="admin-modal-dialog-options-ul">
374 374
 				<li>
375 375
 					<a id="txn-admin-modal-dialog-apply-payment-lnk" class="button-primary no-icon" style="display:none;" >
376
-						<?php _e( 'Apply Payment', 'event_espresso' );?>
376
+						<?php _e('Apply Payment', 'event_espresso'); ?>
377 377
 					</a>
378 378
 				</li>
379 379
 				<li>
380 380
 					<a id="txn-admin-modal-dialog-edit-payment-lnk" class="button-primary no-icon" style="display:none;" >
381
-						<?php _e( 'Save Payment Details', 'event_espresso' );?>
381
+						<?php _e('Save Payment Details', 'event_espresso'); ?>
382 382
 					</a>
383 383
 				</li>
384 384
 				<li>
385 385
 					<a id="txn-admin-modal-dialog-edit-refund-lnk" class="button-primary no-icon" style="display:none;" >
386
-						<?php _e( 'Save Refund Details', 'event_espresso' );?>
386
+						<?php _e('Save Refund Details', 'event_espresso'); ?>
387 387
 					</a>
388 388
 				</li>
389 389
 				<li>
390 390
 					<a id="txn-admin-modal-dialog-apply-refund-lnk" class="button-primary no-icon" style="display:none;" >
391
-						<?php _e( 'Apply Refund', 'event_espresso' );?>
391
+						<?php _e('Apply Refund', 'event_espresso'); ?>
392 392
 					</a>
393 393
 				</li>
394 394
 				<li>
395 395
 					<a id="txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
396
-						<?php _e( 'Cancel', 'event_espresso' );?>
396
+						<?php _e('Cancel', 'event_espresso'); ?>
397 397
 					</a>
398 398
 				</li>
399 399
 				<li>
@@ -410,29 +410,29 @@  discard block
 block discarded – undo
410 410
 
411 411
 		<h2 id="admin-modal-dialog-delete-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
412 412
 			<span class="ee-icon ee-icon-cash-add"></span>
413
-			<?php echo __( 'Delete Payment/Refund for Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
413
+			<?php echo __('Delete Payment/Refund for Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
414 414
 		</h2>
415 415
 
416 416
 		<form name="txn-admin-delete-payment-frm" id="txn-admin-delete-payment-frm" action="<?php echo $delete_payment_url; ?>">
417 417
 			<div class="admin-modal-dialog-wrap">
418 418
 				<div class="admin-modal-dialog-inner">
419 419
 
420
-					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_delete_payment_nonce' );?>"/>
420
+					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce('espresso_delete_payment_nonce'); ?>"/>
421 421
 					<input  type="hidden" name="delete_espresso_ajax" id="delete-espresso-ajax" value="0"/>
422 422
 					<input  type="hidden" name="delete_noheader" id="delete-txn-admin-noheader-inp" value="0"/>
423 423
 					<input  type="hidden" name="delete_txn_admin_payment[PAY_ID]" id="delete-txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
424 424
 					<input  type="hidden" name="delete_txn_admin_payment[TXN_ID]" id="delete-txn-admin-payment-txn-id-inp" value="<?php echo $txn_nmbr['value']; ?>"/>
425 425
 
426 426
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
427
-						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
427
+						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
428 428
 						<?php echo $delete_status_change_select; ?>
429
-						<p class="description"><?php printf( __('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
429
+						<p class="description"><?php printf(__('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>'); ?></p>
430 430
 					</div>
431 431
 
432 432
 					<div class="ee-attention txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
433
-						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
433
+						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
434 434
 						<input type="checkbox" value="1" name="delete_txn_reg_status_change[send_notifications]">
435
-						<p class="description"><?php _e( 'If you check this box, the system will send any related messages matching the status of the registrations to each registration for this transaction.', 'event_espresso' );?></p>
435
+						<p class="description"><?php _e('If you check this box, the system will send any related messages matching the status of the registrations to each registration for this transaction.', 'event_espresso'); ?></p>
436 436
 					</div>
437 437
 					<div class="clear"></div>
438 438
 
@@ -442,12 +442,12 @@  discard block
 block discarded – undo
442 442
 			<ul id="del-admin-modal-dialog-options-ul">
443 443
 				<li>
444 444
 					<a id="txn-admin-modal-dialog-delete-lnk" class="button-primary no-icon" style="display:none;" >
445
-						<?php _e( 'Delete', 'event_espresso' );?>
445
+						<?php _e('Delete', 'event_espresso'); ?>
446 446
 					</a>
447 447
 				</li>
448 448
 				<li>
449 449
 					<a id="del-txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
450
-						<?php _e( 'Cancel', 'event_espresso' );?>
450
+						<?php _e('Cancel', 'event_espresso'); ?>
451 451
 					</a>
452 452
 				</li>
453 453
 				<li>
@@ -463,30 +463,30 @@  discard block
 block discarded – undo
463 463
 	<?php endif; // $grand_raw_total > 0?>
464 464
 
465 465
 	<?php
466
-	if ( WP_DEBUG ) {
467
-		$delivered_messages = get_option( 'EED_Messages__payment', array() );
468
-		if ( isset( $delivered_messages[ $TXN_ID ] )) {
466
+	if (WP_DEBUG) {
467
+		$delivered_messages = get_option('EED_Messages__payment', array());
468
+		if (isset($delivered_messages[$TXN_ID])) {
469 469
 			?>
470
-			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Primary Registrant', 'event_espresso' );?></h4>
470
+			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Primary Registrant', 'event_espresso'); ?></h4>
471 471
 
472 472
 			<div class="admin-primary-mbox-tbl-wrap">
473 473
 				<table class="admin-primary-mbox-tbl">
474 474
 					<thead>
475 475
 						<tr>
476
-							<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
477
-							<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
478
-							<th class="jst-left"><?php _e( 'Payment Status Upon Sending', 'event_espresso' );?></th>
479
-							<th class="jst-left"><?php _e( 'TXN Status Upon Sending', 'event_espresso' );?></th>
476
+							<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
477
+							<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
478
+							<th class="jst-left"><?php _e('Payment Status Upon Sending', 'event_espresso'); ?></th>
479
+							<th class="jst-left"><?php _e('TXN Status Upon Sending', 'event_espresso'); ?></th>
480 480
 						</tr>
481 481
 					</thead>
482 482
 					<tbody>
483
-						<?php foreach ( $delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message ) :
483
+						<?php foreach ($delivered_messages[$TXN_ID] as $timestamp => $delivered_message) :
484 484
 							?>
485 485
 							<tr>
486
-								<td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
487
-								<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
488
-								<td class="jst-left"><?php echo isset( $delivered_message['pay_status'] ) ? $delivered_message['pay_status'] : '';?></td>
489
-								<td class="jst-left"><?php echo isset( $delivered_message['txn_status'] ) ? $delivered_message['txn_status'] : '';?></td>
486
+								<td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
487
+								<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
488
+								<td class="jst-left"><?php echo isset($delivered_message['pay_status']) ? $delivered_message['pay_status'] : ''; ?></td>
489
+								<td class="jst-left"><?php echo isset($delivered_message['txn_status']) ? $delivered_message['txn_status'] : ''; ?></td>
490 490
 							</tr>
491 491
 						<?php endforeach; // $delivered_messages?>
492 492
 					</tbody>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,10 +141,13 @@
 block discarded – undo
141 141
 					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid . sprintf( __( 'Payments Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );?></span></th>
142 142
 					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE);?></span></th>
143 143
 				</tr>
144
-		<?php else : ?>
144
+		<?php else {
145
+	: ?>
145 146
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
146 147
 					<td class=" jst-rght" colspan="11">
147
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
148
+						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' );
149
+}
150
+?></span>
148 151
 					</td>
149 152
 				</tr>
150 153
 				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
Please login to merge, or discard this patch.
templates/txn_admin_details_side_meta_box_billing_info.template.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,27 +1,27 @@
 block discarded – undo
1 1
 	<div id="admin-side-mbox-billing-info-dv" class="admin-side-mbox-dv">
2
-<?php if ( empty($billing_form) ) : ?>
2
+<?php if (empty($billing_form)) : ?>
3 3
 		<div class="clearfix">
4
-			<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
4
+			<?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/>
5 5
 		</div>
6 6
 <?php else :
7
-	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section ) {
8
-		foreach( $form_section->subsections() as $subsection ) {
9
-			if( $subsection instanceof EE_Form_Input_Base ) {
10
-				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal ||
11
-					$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal ){
7
+	function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section) {
8
+		foreach ($form_section->subsections() as $subsection) {
9
+			if ($subsection instanceof EE_Form_Input_Base) {
10
+				if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal ||
11
+					$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal) {
12 12
 					continue;
13 13
 				}
14 14
 				?>
15 15
 					<div class="clearfix">
16
-						<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label();?></span><?php echo $subsection->pretty_value();?>
16
+						<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label(); ?></span><?php echo $subsection->pretty_value(); ?>
17 17
 					</div><?php
18
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
19
-				ee_show_billing_info_cleaned( $subsection );
18
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
19
+				ee_show_billing_info_cleaned($subsection);
20 20
 			}
21 21
 		}
22 22
 	}
23
-	ee_show_billing_info_cleaned( $billing_form ); ?>
24
-		<p class="help"><?php _e( 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso' );?></p>
23
+	ee_show_billing_info_cleaned($billing_form); ?>
24
+		<p class="help"><?php _e('Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso'); ?></p>
25 25
 <?php endif; ?>
26 26
 
27 27
 	</div>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,13 +3,15 @@
 block discarded – undo
3 3
 		<div class="clearfix">
4 4
 			<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
5 5
 		</div>
6
-<?php else :
6
+<?php else {
7
+	:
7 8
 	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section ) {
8 9
 		foreach( $form_section->subsections() as $subsection ) {
9 10
 			if( $subsection instanceof EE_Form_Input_Base ) {
10 11
 				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal ||
11 12
 					$subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal ){
12 13
 					continue;
14
+}
13 15
 				}
14 16
 				?>
15 17
 					<div class="clearfix">
Please login to merge, or discard this patch.
templates/txn_admin_details_side_meta_box_registrant.template.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,23 +9,23 @@  discard block
 block discarded – undo
9 9
 /** @type string $edit_attendee_url */
10 10
 ?>
11 11
 <div id="admin-side-mbox-primary-registrant-dv" class="admin-side-mbox-dv">
12
-<?php if ( ! empty( $no_attendee_message ) ) : ?>
12
+<?php if ( ! empty($no_attendee_message)) : ?>
13 13
 	<p class="clearfix">
14 14
 		<?php echo $no_attendee_message; ?>
15 15
 	</p>
16 16
 </div> <!-- end #admin-side-mbox-primary-registrant-dv -->
17 17
 <?php else : ?>
18 18
 	<p class="clearfix">
19
-		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Name', 'event_espresso' );?></span><?php 	echo $prime_reg_fname . ' ' . $prime_reg_lname;?>
19
+		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Name', 'event_espresso'); ?></span><?php 	echo $prime_reg_fname.' '.$prime_reg_lname; ?>
20 20
 	</p>
21 21
 	<p class="clearfix">
22
-		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Email', 'event_espresso' );?></span><a href="mailto:<?php echo $prime_reg_email;?>"><?php echo $prime_reg_email;?></a>
22
+		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a href="mailto:<?php echo $prime_reg_email; ?>"><?php echo $prime_reg_email; ?></a>
23 23
 	</p>
24 24
 	<p class="clearfix">
25
-		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Phone #', 'event_espresso' );?></span><?php echo $prime_reg_phone;?>
25
+		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Phone #', 'event_espresso'); ?></span><?php echo $prime_reg_phone; ?>
26 26
 	</p>
27 27
 	<p class="clearfix">
28
-		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Address', 'event_espresso' );?></span>
28
+		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Address', 'event_espresso'); ?></span>
29 29
 		<div class="admin-side-mbox-text-dv">
30 30
 			<?php echo $formatted_address; ?>
31 31
 		</div>
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 
35 35
 
36 36
 <p style="text-align:right;">
37
-	<a class="button button-small" href="<?php echo $edit_attendee_url; ?>" title="<?php esc_attr_e( 'View details for this contact.', 'event_espresso' );?>">
37
+	<a class="button button-small" href="<?php echo $edit_attendee_url; ?>" title="<?php esc_attr_e('View details for this contact.', 'event_espresso'); ?>">
38 38
 		<span class="ee-icon ee-icon-user-edit"></span><?php _e('View / Edit this Contact', 'event_espresso'); ?>
39 39
 	</a>
40 40
 </p>
41
-<?php endif;  //end no attendee check?>
41
+<?php endif; //end no attendee check?>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,9 +14,12 @@
 block discarded – undo
14 14
 		<?php echo $no_attendee_message; ?>
15 15
 	</p>
16 16
 </div> <!-- end #admin-side-mbox-primary-registrant-dv -->
17
-<?php else : ?>
17
+<?php else {
18
+	: ?>
18 19
 	<p class="clearfix">
19
-		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Name', 'event_espresso' );?></span><?php 	echo $prime_reg_fname . ' ' . $prime_reg_lname;?>
20
+		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Name', 'event_espresso' );
21
+}
22
+?></span><?php 	echo $prime_reg_fname . ' ' . $prime_reg_lname;?>
20 23
 	</p>
21 24
 	<p class="clearfix">
22 25
 		<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e( 'Email', 'event_espresso' );?></span><a href="mailto:<?php echo $prime_reg_email;?>"><?php echo $prime_reg_email;?></a>
Please login to merge, or discard this patch.
templates/txn_admin_details_side_meta_box_txn_number.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@
 block discarded – undo
2 2
 
3 3
 	<table id="admin-primary-mbox-txn-details-tbl" class="form-table">
4 4
 		<tbody>
5
-		<?php foreach ( $txn_details as $key => $txn_detail ) : ?>
5
+		<?php foreach ($txn_details as $key => $txn_detail) : ?>
6 6
 			<tr>
7 7
 				<th>
8
-					<label for="<?php echo $key;?>"><?php echo $txn_detail['label'];?></label>
8
+					<label for="<?php echo $key; ?>"><?php echo $txn_detail['label']; ?></label>
9 9
 				</th>
10 10
 				<td>
11
-					<?php echo $txn_detail['value'];?>
11
+					<?php echo $txn_detail['value']; ?>
12 12
 				</td>
13 13
 			</tr>
14 14
 		<?php endforeach; // $txn_details?>
Please login to merge, or discard this patch.
admin_pages/transactions/templates/txn_admin_overview.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 
2 2
 		<ul class="subsubsub">
3
-			<li class="all"><a class="current" href="<?php echo $view_all_url;?>">View All <span class="count">(<?php echo $table_rows; ?>)</span></a></li>
3
+			<li class="all"><a class="current" href="<?php echo $view_all_url; ?>">View All <span class="count">(<?php echo $table_rows; ?>)</span></a></li>
4 4
 		</ul>
5 5
 
6 6
 		<div id="txn-filters-dv">
7
-			<form id="txn-filters-frm" action="<?php echo $txn_overview_url;?>" method="post" name="txn-filters-frm">
8
-				<label for="txn-filter-start-date"><?php _e( 'Display Transactions from ', 'event_espresso' ); ?></label>
7
+			<form id="txn-filters-frm" action="<?php echo $txn_overview_url; ?>" method="post" name="txn-filters-frm">
8
+				<label for="txn-filter-start-date"><?php _e('Display Transactions from ', 'event_espresso'); ?></label>
9 9
 				<input id="txn-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>" name="txn-filter-start-date" size="15"/>	
10
-				<label for="txn-filter-end-date"> <?php _e( 'until', 'event_espresso' ); ?> </label>
10
+				<label for="txn-filter-end-date"> <?php _e('until', 'event_espresso'); ?> </label>
11 11
 				<input id="txn-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>" name="txn-filter-end-date" size="15"/>	
12 12
 				<input id="submit-txn-filters-sbmt" class="button-secondary" type="submit" value="Filter Months">
13 13
 			</form>
14 14
 		</div>
15 15
 
16
-        <form id="transactions-overview-frm" action="<?php echo $txn_overview_url;?>" method="get">
16
+        <form id="transactions-overview-frm" action="<?php echo $txn_overview_url; ?>" method="get">
17 17
             <input type="hidden" name="page" value="<?php echo $_REQUEST['page'] ?>" />
18 18
             <input type="hidden" id="per_page" name="per_page" value="" />
19 19
             <?php echo $list_table->display(); ?>
Please login to merge, or discard this patch.
admin_pages/transactions/templates/txn_admin_wrapper.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <div class="wrap">
2 2
 
3
-	<h2><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php esc_attr_e( $admin_page_title, 'event_espresso' ); ?></h2>
3
+	<h2><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php esc_attr_e($admin_page_title, 'event_espresso'); ?></h2>
4 4
 
5 5
 	<h2 class="nav-tab-wrapper">
6 6
 		<a class="nav-tab<?php echo $tab_active_overview; ?>" href="<?php echo $tab_url_overview; ?>"><?php echo $tab_lnk_overview; ?></a>
7
-		<?php if ( $tab_details ) : ?>
7
+		<?php if ($tab_details) : ?>
8 8
 			<a class="nav-tab<?php echo $tab_active_details; ?>" href="<?php echo $tab_url_details; ?>"><?php echo $tab_lnk_details; ?></a>
9 9
 		<?php endif; ?>
10 10
 		<a class="nav-tab<?php echo $tab_active_reports; ?>" href="<?php echo $tab_url_reports; ?>"><?php echo $tab_lnk_reports; ?></a>
Please login to merge, or discard this patch.
caffeinated/admin/extend/about/Extend_About_Admin_Page.core.php 2 patches
Spacing   +13 added lines, -13 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
 /**
@@ -32,15 +32,15 @@  discard block
 block discarded – undo
32 32
 
33 33
 
34 34
 
35
-	public function __construct( $routing = TRUE ) {
36
-		parent::__construct( $routing );
37
-		define( 'EE_ABOUT_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'about/templates/' );
35
+	public function __construct($routing = TRUE) {
36
+		parent::__construct($routing);
37
+		define('EE_ABOUT_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'about/templates/');
38 38
 	}
39 39
 
40 40
 
41 41
 
42 42
 	protected function _extend_page_config() {
43
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'about';
43
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'about';
44 44
 	}
45 45
 
46 46
 	protected function _set_page_routes() {
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
89 89
 	protected function _whats_new() {
90 90
 		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
91 91
 		$steps = $steps !== FALSE ? $steps : '';
92
-		$this->_admin_page_title = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
92
+		$this->_admin_page_title = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
93 93
 		$settings_message = $steps;
94
-		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso'). $settings_message ;
95
-		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH . 'whats_new.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH . 'whats_new.template.php' : EE_ABOUT_TEMPLATE_PATH . 'whats_new.template.php';
96
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
94
+		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso').$settings_message;
95
+		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH.'whats_new.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH.'whats_new.template.php' : EE_ABOUT_TEMPLATE_PATH.'whats_new.template.php';
96
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
97 97
 		$this->display_about_admin_page();
98 98
 	}
99 99
 
@@ -101,16 +101,16 @@  discard block
 block discarded – undo
101 101
 	protected function _overview() {
102 102
 		$this->_admin_page_title = __('About Event Espresso', 'event_espresso');
103 103
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso');
104
-		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH . 'ee4-overview.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH . 'ee4-overview.template.php' : EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
105
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
104
+		$template = is_readable(EE_ABOUT_CAF_TEMPLATE_PATH.'ee4-overview.template.php') ? EE_ABOUT_CAF_TEMPLATE_PATH.'ee4-overview.template.php' : EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
105
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
106 106
 		$this->display_about_admin_page();
107 107
 	}
108 108
 
109 109
 	protected function _credits() {
110 110
 	//	$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
111 111
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful Event Management plugin for WordPress.', 'event_espresso');
112
-		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
113
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
112
+		$template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
113
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
114 114
 		$this->display_about_admin_page();
115 115
 	}
116 116
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
caffeinated/admin/extend/about/templates/whats_new.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,25 +1,25 @@
 block discarded – undo
1 1
 <div class="changelog point-releases">
2
-	<!-- <h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3> -->
3
-	<h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>
2
+	<!-- <h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3> -->
3
+	<h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>
4 4
 	<?php //$type = 'minor'; ?>
5 5
 	<?php $type = 'major'; ?>
6
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
6
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
7 7
 		<?php
8
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
9
-			array_pop( $ver );
10
-			$ver = implode( '.', $ver );
8
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
9
+			array_pop($ver);
10
+			$ver = implode('.', $ver);
11 11
 		?>
12
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
12
+		<?php printf(__('For more information, see <a href="%s">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
13 13
  	</p>
14 14
 </div>
15 15
 
16 16
 <div class="changelog">
17 17
 	<?php
18 18
 	//maintenance mode on?
19
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
19
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
20 20
 		?>
21 21
 		<div class="ee-attention">
22
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
22
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
23 23
 			<p>
24 24
 			<?php
25 25
 				printf(
Please login to merge, or discard this patch.
caffeinated/admin/extend/events/Extend_Events_Admin_List_Table.class.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,14 +17,14 @@
 block discarded – undo
17 17
  */
18 18
 class Extend_Events_Admin_List_Table extends Events_Admin_List_Table {
19 19
 
20
-	protected function _column_name_action_setup( EE_Event $item ) {
20
+	protected function _column_name_action_setup(EE_Event $item) {
21 21
 		$export_query_args = array(
22 22
 				'action' => 'export_events',
23 23
 				'EVT_ID' => $item->ID()
24 24
 			);
25
-		$export_event_link = EE_Admin_Page::add_query_args_and_nonce( $export_query_args, EVENTS_ADMIN_URL );
25
+		$export_event_link = EE_Admin_Page::add_query_args_and_nonce($export_query_args, EVENTS_ADMIN_URL);
26 26
 
27
-		$actions = parent::_column_name_action_setup( $item );
27
+		$actions = parent::_column_name_action_setup($item);
28 28
 //		$actions['export'] = '<a href="' . $export_event_link . '" title="' . __('Export Event', 'event_espresso') . '">' . __('Export', 'event_espresso') . '</a>';
29 29
 		return $actions;
30 30
 	}
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.