@@ -1,28 +1,28 @@ |
||
1 | 1 | <div id="admin-side-mbox-primary-registrant-dv" class="admin-side-mbox-dv"> |
2 | 2 | <p class="clearfix"> |
3 | - <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Name', 'event_espresso'); ?></span><?php echo $fname . ' ' . $lname;?> |
|
3 | + <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Name', 'event_espresso'); ?></span><?php echo $fname.' '.$lname; ?> |
|
4 | 4 | </p> |
5 | 5 | <p class="clearfix"> |
6 | - <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a href="mailto:<?php echo $email;?>"><?php echo $email;?></a> |
|
6 | + <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a href="mailto:<?php echo $email; ?>"><?php echo $email; ?></a> |
|
7 | 7 | </p> |
8 | 8 | <p class="clearfix"> |
9 | - <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Phone #', 'event_espresso'); ?></span><?php echo $phone;?> |
|
9 | + <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Phone #', 'event_espresso'); ?></span><?php echo $phone; ?> |
|
10 | 10 | </p> |
11 | 11 | <p class="clearfix"> |
12 | 12 | <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Address', 'event_espresso'); ?></span> |
13 | 13 | <div class="admin-side-mbox-text-dv"> |
14 | - <?php echo $formatted_address;?> |
|
14 | + <?php echo $formatted_address; ?> |
|
15 | 15 | </div> |
16 | 16 | </p> |
17 | 17 | </div> |
18 | 18 | |
19 | 19 | |
20 | 20 | <p class="contact-details-buttons"> |
21 | - <?php if ( $att_check instanceof EE_Attendee ) : ?> |
|
22 | - <a class="button button-small" href="<?php echo $att_edit_link; ?>" title="<?php echo esc_attr( $att_edit_label ); ?>"> |
|
21 | + <?php if ($att_check instanceof EE_Attendee) : ?> |
|
22 | + <a class="button button-small" href="<?php echo $att_edit_link; ?>" title="<?php echo esc_attr($att_edit_label); ?>"> |
|
23 | 23 | <span class="ee-icon ee-icon-user-edit"></span><?php echo $att_edit_label; ?> |
24 | 24 | </a> |
25 | - <?php if ( !empty( $create_link ) ) : ?> |
|
25 | + <?php if ( ! empty($create_link)) : ?> |
|
26 | 26 | <a class="button button-small" href="<?php echo $create_link; ?>" title="<?php esc_attr_e('This registration shares the contact details for the primary registration in this group. If you\'d like this registration to have its own details, you can do so by clicking this button', 'event_espresso'); ?>"> |
27 | 27 | <span class="ee-icon ee-icon-user-add-new"></span><?php echo $create_label; ?> |
28 | 28 | </a> |
@@ -1,2 +1,2 @@ |
||
1 | -<h1><span class="small-text not-bold"><?php _e( 'Adding Registration For: ', 'event_espresso' );?></span><?php echo $event_name;?></h1> |
|
1 | +<h1><span class="small-text not-bold"><?php _e('Adding Registration For: ', 'event_espresso'); ?></span><?php echo $event_name; ?></h1> |
|
2 | 2 | <?php echo $step_content; ?> |
3 | 3 | \ No newline at end of file |
@@ -2,13 +2,13 @@ |
||
2 | 2 | <h2 class="ee-new-registration-step-header"><?php echo $title ?></h2> |
3 | 3 | <div class="ee-new-registration-step-content"> |
4 | 4 | <?php echo $content; ?> |
5 | - <?php if ( $show_notification_toggle && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'registration_message_type' ) ) : ?> |
|
5 | + <?php if ($show_notification_toggle && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'registration_message_type')) : ?> |
|
6 | 6 | <div class="ee-attention"> |
7 | - <label for="txn_reg_status_change" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label> |
|
7 | + <label for="txn_reg_status_change" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label> |
|
8 | 8 | <input type="checkbox" value="1" name="txn_reg_status_change[send_notifications]" checked=checked> |
9 | 9 | <br/> |
10 | 10 | <br /> |
11 | - <p class="description"><?php _e( 'Send a notification to registrants after processing?', 'event_espresso' );?></p><br/> |
|
11 | + <p class="description"><?php _e('Send a notification to registrants after processing?', 'event_espresso'); ?></p><br/> |
|
12 | 12 | <label></label> |
13 | 13 | </div> |
14 | 14 | <?php endif; ?> |
@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <div id="reg-admin-approve-decline-reg-status-dv"> |
2 | 2 | |
3 | 3 | <h2 id="reg-admin-reg-details-reg-status-hdr"> |
4 | - <?php echo __( 'Current Registration Status : ', 'event_espresso' ); ?> |
|
4 | + <?php echo __('Current Registration Status : ', 'event_espresso'); ?> |
|
5 | 5 | <span class="<?php echo $reg_status_class; ?> bigger-text"><?php echo $reg_status_value; ?></span> |
6 | 6 | </h2> |
7 | 7 | |
8 | 8 | <h3 id="reg-admin-reg-details-reg-status-hdr"> |
9 | - <?php echo __( 'Change Registration Status to :', 'event_espresso' ); ?> |
|
9 | + <?php echo __('Change Registration Status to :', 'event_espresso'); ?> |
|
10 | 10 | </h3> |
11 | 11 | |
12 | 12 | <form id="reg_status_change_form" method="POST" action="<?php echo $form_url; ?>"> |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | <input type="hidden" name="return" value="view_registration"> |
16 | 16 | <?php echo $nonce; ?> |
17 | 17 | <?php echo $status_buttons; ?> |
18 | - <?php if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'registration_message_type' ) ) : ?> |
|
18 | + <?php if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'registration_message_type')) : ?> |
|
19 | 19 | <span id="send-related-messages-dv"> |
20 | - <label for="txn-reg-status-send-notifications-inp" class="important-notice"><?php _e( '...and send related messages ?', 'event_espresso' ); ?> |
|
20 | + <label for="txn-reg-status-send-notifications-inp" class="important-notice"><?php _e('...and send related messages ?', 'event_espresso'); ?> |
|
21 | 21 | <input type="checkbox" value="1" id="txn-reg-status-send-notifications-inp" name="txn_reg_status_change[send_notifications]"> |
22 | 22 | </label> |
23 | 23 | <br/> |
24 | 24 | </span> |
25 | 25 | <br/> |
26 | - <p class="description"><?php _e( 'If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.', 'event_espresso' ); ?></p> |
|
26 | + <p class="description"><?php _e('If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.', 'event_espresso'); ?></p> |
|
27 | 27 | <?php endif; ?> |
28 | 28 | </form> |
29 | 29 | </div> |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <div id="single-page-checkout" class="ui-widget"> |
2 | - <?php do_action( 'AHEE__registration_page_registration_questions__template__after_spco_attendee_information_header' )?> |
|
2 | + <?php do_action('AHEE__registration_page_registration_questions__template__after_spco_attendee_information_header')?> |
|
3 | 3 | <div id="spco-attendee_information-dv" class="spco-step-dv"> |
4 | 4 | |
5 | 5 | <p id="spco-attendee_information-pg" class="spco-steps-pg small-text drk-grey-text"> |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | __('In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.', 'event_espresso'), |
8 | 8 | '<br />', |
9 | 9 | '<span class="asterisk">*</span>' |
10 | - );?> |
|
10 | + ); ?> |
|
11 | 11 | </p> |
12 | 12 | |
13 | 13 | <?php |
@@ -15,20 +15,20 @@ discard block |
||
15 | 15 | $att_nmbr = 0; |
16 | 16 | $prev_event = ''; |
17 | 17 | |
18 | - if ( $event_queue['total_items'] > 0 ) { |
|
19 | - foreach ( $event_queue['items'] as $line_item => $item ) { |
|
18 | + if ($event_queue['total_items'] > 0) { |
|
19 | + foreach ($event_queue['items'] as $line_item => $item) { |
|
20 | 20 | $att_nmbr++; |
21 | - if ( $item['attendee_questions'] != '' ) { |
|
21 | + if ($item['attendee_questions'] != '') { |
|
22 | 22 | ?> |
23 | 23 | |
24 | - <div id="spco-attendee-panel-dv-<?php echo $line_item;?>" class="spco-attendee-panel-dv"> |
|
24 | + <div id="spco-attendee-panel-dv-<?php echo $line_item; ?>" class="spco-attendee-panel-dv"> |
|
25 | 25 | |
26 | - <?php if ( $item['ticket']->name() != $prev_event ) { ?> |
|
26 | + <?php if ($item['ticket']->name() != $prev_event) { ?> |
|
27 | 27 | <p class="spco-ticket-info-pg"> |
28 | 28 | <?php |
29 | - echo $item['ticket']->name() . ': ' . EEH_Template::format_currency( $item['ticket']->price(), FALSE, FALSE ); |
|
30 | - echo $item['ticket']->qty() ? ' x ' . $ticket_count[ $item['ticket']->ID() ] . __(' tickets', 'event_espresso') . ' = ' . EEH_Template::format_currency( $item['ticket']->price() * $ticket_count[ $item['ticket']->ID() ] ) : ''; |
|
31 | - echo $item['ticket']->description() ? '<br/>' . __('Ticket Details: ', 'event_espresso') . $item['ticket']->description() : ''; |
|
29 | + echo $item['ticket']->name().': '.EEH_Template::format_currency($item['ticket']->price(), FALSE, FALSE); |
|
30 | + echo $item['ticket']->qty() ? ' x '.$ticket_count[$item['ticket']->ID()].__(' tickets', 'event_espresso').' = '.EEH_Template::format_currency($item['ticket']->price() * $ticket_count[$item['ticket']->ID()]) : ''; |
|
31 | + echo $item['ticket']->description() ? '<br/>'.__('Ticket Details: ', 'event_espresso').$item['ticket']->description() : ''; |
|
32 | 32 | ?> |
33 | 33 | </p> |
34 | 34 | |
@@ -36,50 +36,50 @@ discard block |
||
36 | 36 | } |
37 | 37 | ?> |
38 | 38 | |
39 | - <fieldset id="spco-attendee-wrap-<?php echo $line_item;?>" class="spco-attendee-wrap-fs"> |
|
40 | - <legend class="spco-attendee-lgnd smaller-text lt-grey-text"><?php echo __('Registrant #', 'event_espresso') . $att_nmbr;?></legend> |
|
39 | + <fieldset id="spco-attendee-wrap-<?php echo $line_item; ?>" class="spco-attendee-wrap-fs"> |
|
40 | + <legend class="spco-attendee-lgnd smaller-text lt-grey-text"><?php echo __('Registrant #', 'event_espresso').$att_nmbr; ?></legend> |
|
41 | 41 | |
42 | 42 | <?php |
43 | 43 | //do an action before the questions output, including the item and count |
44 | - echo do_action( 'AHEE__registration_page_registration_questions__template___before_questions', $item, $att_nmbr ); |
|
44 | + echo do_action('AHEE__registration_page_registration_questions__template___before_questions', $item, $att_nmbr); |
|
45 | 45 | echo $item['attendee_questions']; |
46 | 46 | |
47 | - if ( $att_nmbr == 1 && $print_copy_info ) { ?> |
|
47 | + if ($att_nmbr == 1 && $print_copy_info) { ?> |
|
48 | 48 | |
49 | 49 | <input type="hidden" id="primary-attendee" name="qstn[primary_attendee]" value="<?php echo $prmy_att_input_name ?>" /> |
50 | 50 | |
51 | 51 | <div id="spco-copy-attendee-dv" class="hide-if-no-js"> |
52 | 52 | |
53 | 53 | <p class="spco-copy-all-attendee-pg"> |
54 | - <label class="wide"><?php _e('Use Registrant #1\'s information for ALL registrants', 'event_espresso');?> |
|
54 | + <label class="wide"><?php _e('Use Registrant #1\'s information for ALL registrants', 'event_espresso'); ?> |
|
55 | 55 | <input id="spco-copy-all-attendee-chk" class="spco-copy-all-attendee-chk ui-widget-content ui-corner-all" type="checkbox" value="copy-all"> |
56 | 56 | </label> |
57 | 57 | </p> |
58 | 58 | |
59 | 59 | <p class="spco-copy-attendee-pg"><?php _e('This option allows you to use the above information for all additional registrant question fields. <span>( Please note that some events may have additional questions that you may still be required to answer in order to complete your registration. )</span>', 'event_espresso'); ?></p> |
60 | 60 | |
61 | - <a id="display-more-attendee-copy-options" class="display-the-hidden smaller-text float-right" rel="more-attendee-copy-options" ><?php _e('more options', 'event_espresso');?></a> |
|
61 | + <a id="display-more-attendee-copy-options" class="display-the-hidden smaller-text float-right" rel="more-attendee-copy-options" ><?php _e('more options', 'event_espresso'); ?></a> |
|
62 | 62 | |
63 | 63 | <div id="more-attendee-copy-options-dv" class=""> |
64 | - <a id="hide-more-attendee-copy-options" class="hide-the-displayed smaller-text float-right" rel="more-attendee-copy-options" ><?php _e('less options', 'event_espresso');?></a> |
|
64 | + <a id="hide-more-attendee-copy-options" class="hide-the-displayed smaller-text float-right" rel="more-attendee-copy-options" ><?php _e('less options', 'event_espresso'); ?></a> |
|
65 | 65 | <p class="spco-copy-attendee-pg"> |
66 | 66 | <?php _e('The following checkboxes allow you to use the above information for only the selected additional event registrants.', 'event_espresso'); ?> |
67 | 67 | </p> |
68 | 68 | |
69 | 69 | <?php |
70 | - foreach ( $additional_event_attendees as $event_attendees ) { |
|
71 | - foreach ( $event_attendees as $attendee ) { |
|
70 | + foreach ($additional_event_attendees as $event_attendees) { |
|
71 | + foreach ($event_attendees as $attendee) { |
|
72 | 72 | |
73 | - if ( $attendee['event_hdr'] ) { ?> |
|
73 | + if ($attendee['event_hdr']) { ?> |
|
74 | 74 | <h6 class="spco-copy-attendee-event-hdr"><?php echo $attendee['event_hdr']; ?></h6> |
75 | 75 | <?php } ?> |
76 | 76 | |
77 | 77 | <p class="event_form_field spco-copy-attendee-chk-pg"> |
78 | - <label><?php echo __('Attendee #', 'event_espresso') . $attendee['att_nmbr'];?> |
|
78 | + <label><?php echo __('Attendee #', 'event_espresso').$attendee['att_nmbr']; ?> |
|
79 | 79 | <input type="checkbox" |
80 | - id="spco-copy-attendee-chk-<?php echo $attendee['input_id'];?>" |
|
81 | - class="spco-copy-attendee-chk <?php echo $css_class;?>" |
|
82 | - value="<?php echo $attendee['input_id'];?>" |
|
80 | + id="spco-copy-attendee-chk-<?php echo $attendee['input_id']; ?>" |
|
81 | + class="spco-copy-attendee-chk <?php echo $css_class; ?>" |
|
82 | + value="<?php echo $attendee['input_id']; ?>" |
|
83 | 83 | /> |
84 | 84 | </label> |
85 | 85 | </p> |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | <?php |
96 | 96 | $print_copy_info = FALSE; |
97 | 97 | |
98 | - } else if ( $att_nmbr == 1 ) { |
|
98 | + } else if ($att_nmbr == 1) { |
|
99 | 99 | ?> |
100 | 100 | <p id="spco-auto-copy-attendee-pg" class="smaller-text lt-grey-text"> |
101 | 101 | <?php _e('The above information will be used for any additional tickets/registrants.', 'event_espresso'); ?> |
@@ -109,13 +109,13 @@ discard block |
||
109 | 109 | </div> |
110 | 110 | <?php |
111 | 111 | } else { |
112 | - if ( $att_nmbr == 1 ) { |
|
112 | + if ($att_nmbr == 1) { |
|
113 | 113 | ?> |
114 | - <div id="spco-attendee-panel-dv-<?php echo $line_item;?>" class="spco-attendee-panel-dv"> |
|
114 | + <div id="spco-attendee-panel-dv-<?php echo $line_item; ?>" class="spco-attendee-panel-dv"> |
|
115 | 115 | <h3 id="event_title-<?php echo $item['ticket']->ID() ?>" class="big-event-title-hdr"> |
116 | 116 | <?php echo $item['event']->name(); ?> |
117 | 117 | </h3> |
118 | - <fieldset id="spco-attendee-wrap-<?php echo $line_item;?>" class="spco-attendee-wrap-fs"> |
|
118 | + <fieldset id="spco-attendee-wrap-<?php echo $line_item; ?>" class="spco-attendee-wrap-fs"> |
|
119 | 119 | <h6><?php _e('No information is required to attend this event. Please proceed to the next Step', 'event_espresso'); ?></h6> |
120 | 120 | <input type="hidden" id="no-questions" name="qstn[]" value="0" /> |
121 | 121 | </fieldset> |
@@ -7,14 +7,14 @@ |
||
7 | 7 | $is_php_valid = version_compare(phpversion(), $php_req_version, '>'); |
8 | 8 | $is_mysql_valid = version_compare($wpdb->db_version(), $mysql_req_version, '>'); |
9 | 9 | |
10 | - if (!version_compare($wp_version, $wp_req_version, '>=')) { |
|
11 | - echo '<p class="red_alert">' . __('This version of Event Espresso requires WordPress version', 'event_espresso') . ' ' . $wp_req_version . '+. ' . __('Please upgrade to the latest version of WordPress.', 'event_espresso') . '</p>'; |
|
10 | + if ( ! version_compare($wp_version, $wp_req_version, '>=')) { |
|
11 | + echo '<p class="red_alert">'.__('This version of Event Espresso requires WordPress version', 'event_espresso').' '.$wp_req_version.'+. '.__('Please upgrade to the latest version of WordPress.', 'event_espresso').'</p>'; |
|
12 | 12 | } |
13 | - if (!$is_php_valid) { |
|
14 | - echo '<p class="red_alert">' . __('Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:', 'event_espresso') . ' ' . $php_req_version . '</p>'; |
|
13 | + if ( ! $is_php_valid) { |
|
14 | + echo '<p class="red_alert">'.__('Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:', 'event_espresso').' '.$php_req_version.'</p>'; |
|
15 | 15 | } |
16 | - if (!$is_mysql_valid) { |
|
17 | - echo '<p class="red_alert">' . __('Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:', 'event_espresso') . ' ' . $mysql_req_version . '</p>'; |
|
16 | + if ( ! $is_mysql_valid) { |
|
17 | + echo '<p class="red_alert">'.__('Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:', 'event_espresso').' '.$mysql_req_version.'</p>'; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | $query_args = array( |
@@ -6,42 +6,42 @@ |
||
6 | 6 | <li> |
7 | 7 | <strong>[ESPRESSO_EVENT_ATTENDEES]</strong><br> |
8 | 8 | <p class="description"> |
9 | - <?php _e('With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event. If it is used in Event Description, then it will show the attendees for that event.', 'event_espresso' ); ?> |
|
9 | + <?php _e('With no parameters, this shows the attendees for the earliest active event, or if no active event, the earliest upcoming event. If it is used in Event Description, then it will show the attendees for that event.', 'event_espresso'); ?> |
|
10 | 10 | </p> |
11 | 11 | <br> |
12 | 12 | </li> |
13 | 13 | <li> |
14 | 14 | <strong>[ESPRESSO_EVENT_ATTENDEES event_id=30]</strong><br> |
15 | 15 | <p class="description"> |
16 | - <?php _e('Will list the attendees for a specific event.', 'event_espresso' ); ?> |
|
16 | + <?php _e('Will list the attendees for a specific event.', 'event_espresso'); ?> |
|
17 | 17 | </p> |
18 | 18 | <br> |
19 | 19 | </li> |
20 | 20 | <li> |
21 | 21 | <strong>[ESPRESSO_EVENT_ATTENDEES datetime_id=245]</strong><br> |
22 | 22 | <p class="description"> |
23 | - <?php _e('Will list the attendees for a specific datetime.', 'event_espresso' ); ?> |
|
23 | + <?php _e('Will list the attendees for a specific datetime.', 'event_espresso'); ?> |
|
24 | 24 | </p> |
25 | 25 | <br> |
26 | 26 | </li> |
27 | 27 | <li> |
28 | 28 | <strong>[ESPRESSO_EVENT_ATTENDEES ticket_id=34]</strong><br> |
29 | 29 | <p class="description"> |
30 | - <?php _e('Will list the attendees for a specific ticket.', 'event_espresso' ); ?> |
|
30 | + <?php _e('Will list the attendees for a specific ticket.', 'event_espresso'); ?> |
|
31 | 31 | </p> |
32 | 32 | <br> |
33 | 33 | </li> |
34 | 34 | <li> |
35 | 35 | <strong>[ESPRESSO_EVENT_ATTENDEES status=RAP]</strong><br> |
36 | 36 | <p class="description"> |
37 | - <?php _e('You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status. Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.', 'event_espresso' ); ?> |
|
37 | + <?php _e('You can list attendees that have a specific registration status (use status code) or use "all" to return all attendees regardless of status. Default when you don\'t have this parameter set is to only return attendees attached to approved contacts.', 'event_espresso'); ?> |
|
38 | 38 | </p> |
39 | 39 | <p> |
40 | 40 | <?php _e('The statuses you can use are:', 'event_espresso'); ?> |
41 | 41 | <br> |
42 | 42 | <?php |
43 | - foreach ( EEM_Registration::reg_status_array( array(), true ) as $status_code => $status_label ) { |
|
44 | - echo '<strong>' . $status_code . ':</strong>' . ' ' . $status_label . '<br>'; |
|
43 | + foreach (EEM_Registration::reg_status_array(array(), true) as $status_code => $status_label) { |
|
44 | + echo '<strong>'.$status_code.':</strong>'.' '.$status_label.'<br>'; |
|
45 | 45 | } |
46 | 46 | ?> |
47 | 47 |
@@ -1,4 +1,6 @@ discard block |
||
1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | +} |
|
2 | 4 | /** |
3 | 5 | * Event Espresso |
4 | 6 | * |
@@ -359,8 +361,10 @@ discard block |
||
359 | 361 | * @return void |
360 | 362 | */ |
361 | 363 | private function _set_transaction_object() { |
362 | - if ( is_object( $this->_transaction) ) |
|
363 | - return; //get out we've already set the object |
|
364 | + if ( is_object( $this->_transaction) ) { |
|
365 | + return; |
|
366 | + } |
|
367 | + //get out we've already set the object |
|
364 | 368 | |
365 | 369 | $TXN = EEM_Transaction::instance(); |
366 | 370 | |
@@ -836,7 +840,7 @@ discard block |
||
836 | 840 | $query_args = array( array( 'OR*payment_method_for_payment' => array( |
837 | 841 | 'PMD_ID' => array( 'IN', $payment_methods_of_payments ), |
838 | 842 | 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) ); |
839 | - }else{ |
|
843 | + } else{ |
|
840 | 844 | $query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ); |
841 | 845 | } |
842 | 846 | $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args ); |
@@ -1455,7 +1455,7 @@ discard block |
||
1455 | 1455 | * @param EE_Transaction $transaction |
1456 | 1456 | * @param \EE_Payment $payment |
1457 | 1457 | * @param array $REG_IDs |
1458 | - * @return bool |
|
1458 | + * @return boolean|null |
|
1459 | 1459 | */ |
1460 | 1460 | protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
1461 | 1461 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
@@ -1647,6 +1647,7 @@ discard block |
||
1647 | 1647 | * |
1648 | 1648 | * @access protected |
1649 | 1649 | * @param \EE_Payment | null $payment |
1650 | + * @param EE_Payment $payment |
|
1650 | 1651 | */ |
1651 | 1652 | protected function _maybe_send_notifications( $payment = null ) { |
1652 | 1653 | switch ( $payment instanceof EE_Payment ) { |
@@ -106,9 +106,9 @@ discard block |
||
106 | 106 | |
107 | 107 | /** |
108 | 108 | * grab url requests and route them |
109 | - * @access private |
|
110 | - * @return void |
|
111 | - */ |
|
109 | + * @access private |
|
110 | + * @return void |
|
111 | + */ |
|
112 | 112 | public function _set_page_routes() { |
113 | 113 | |
114 | 114 | $this->_set_transaction_status_array(); |
@@ -261,10 +261,10 @@ discard block |
||
261 | 261 | /** |
262 | 262 | * _set_transaction_status_array |
263 | 263 | * sets list of transaction statuses |
264 | - * |
|
264 | + * |
|
265 | 265 | * @access private |
266 | - * @return void |
|
267 | - */ |
|
266 | + * @return void |
|
267 | + */ |
|
268 | 268 | private function _set_transaction_status_array() { |
269 | 269 | self::$_txn_status = EEM_Transaction::instance()->status_array(TRUE); |
270 | 270 | } |
@@ -286,10 +286,10 @@ discard block |
||
286 | 286 | |
287 | 287 | /** |
288 | 288 | * get list of payment statuses |
289 | - * |
|
289 | + * |
|
290 | 290 | * @access private |
291 | - * @return void |
|
292 | - */ |
|
291 | + * @return void |
|
292 | + */ |
|
293 | 293 | private function _get_payment_status_array() { |
294 | 294 | self::$_pay_status = EEM_Payment::instance()->status_array(TRUE); |
295 | 295 | $this->_template_args['payment_status'] = self::$_pay_status; |
@@ -397,18 +397,18 @@ discard block |
||
397 | 397 | if ( is_object( $this->_transaction) ) |
398 | 398 | return; //get out we've already set the object |
399 | 399 | |
400 | - $TXN = EEM_Transaction::instance(); |
|
400 | + $TXN = EEM_Transaction::instance(); |
|
401 | 401 | |
402 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
402 | + $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
403 | 403 | |
404 | - //get transaction object |
|
405 | - $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
|
406 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
404 | + //get transaction object |
|
405 | + $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
|
406 | + $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
407 | 407 | |
408 | 408 | if ( empty( $this->_transaction ) ) { |
409 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
409 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
410 | 410 | EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
411 | - } |
|
411 | + } |
|
412 | 412 | } |
413 | 413 | |
414 | 414 | |
@@ -510,12 +510,12 @@ discard block |
||
510 | 510 | |
511 | 511 | |
512 | 512 | /** |
513 | - * _transaction_details |
|
513 | + * _transaction_details |
|
514 | 514 | * generates HTML for the View Transaction Details Admin page |
515 | - * |
|
515 | + * |
|
516 | 516 | * @access protected |
517 | - * @return void |
|
518 | - */ |
|
517 | + * @return void |
|
518 | + */ |
|
519 | 519 | protected function _transaction_details() { |
520 | 520 | do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
521 | 521 | EE_Registry::instance()->load_helper( 'MSG_Template' ); |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | 'button secondary-button right', |
569 | 569 | 'dashicons dashicons-email-alt' |
570 | 570 | ) |
571 | - : ''; |
|
571 | + : ''; |
|
572 | 572 | } else { |
573 | 573 | $this->_template_args['send_payment_reminder_button'] = ''; |
574 | 574 | } |
@@ -722,10 +722,10 @@ discard block |
||
722 | 722 | /** |
723 | 723 | * txn_details_meta_box |
724 | 724 | * generates HTML for the Transaction main meta box |
725 | - * |
|
725 | + * |
|
726 | 726 | * @access public |
727 | - * @return void |
|
728 | - */ |
|
727 | + * @return void |
|
728 | + */ |
|
729 | 729 | public function txn_details_meta_box() { |
730 | 730 | |
731 | 731 | $this->_set_transaction_object(); |
@@ -1066,10 +1066,10 @@ discard block |
||
1066 | 1066 | /** |
1067 | 1067 | * txn_billing_info_side_meta_box |
1068 | 1068 | * generates HTML for the Edit Transaction side meta box |
1069 | - * |
|
1069 | + * |
|
1070 | 1070 | * @access public |
1071 | - * @return void |
|
1072 | - */ |
|
1071 | + * @return void |
|
1072 | + */ |
|
1073 | 1073 | public function txn_billing_info_side_meta_box() { |
1074 | 1074 | |
1075 | 1075 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
@@ -1087,10 +1087,10 @@ discard block |
||
1087 | 1087 | /** |
1088 | 1088 | * apply_payments_or_refunds |
1089 | 1089 | * registers a payment or refund made towards a transaction |
1090 | - * |
|
1090 | + * |
|
1091 | 1091 | * @access public |
1092 | - * @return void |
|
1093 | - */ |
|
1092 | + * @return void |
|
1093 | + */ |
|
1094 | 1094 | public function apply_payments_or_refunds() { |
1095 | 1095 | $json_response_data = array( 'return_data' => FALSE ); |
1096 | 1096 | $valid_data = $this->_validate_payment_request_data(); |
@@ -1244,9 +1244,9 @@ discard block |
||
1244 | 1244 | 'default' => '', |
1245 | 1245 | 'required' => false, |
1246 | 1246 | 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
1247 | - 'validation_strategies' => array( |
|
1248 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1249 | - ) |
|
1247 | + 'validation_strategies' => array( |
|
1248 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1249 | + ) |
|
1250 | 1250 | ) |
1251 | 1251 | ), |
1252 | 1252 | 'po_number' => new EE_Text_Input( |
@@ -1254,9 +1254,9 @@ discard block |
||
1254 | 1254 | 'default' => '', |
1255 | 1255 | 'required' => false, |
1256 | 1256 | 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
1257 | - 'validation_strategies' => array( |
|
1258 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1259 | - ) |
|
1257 | + 'validation_strategies' => array( |
|
1258 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1259 | + ) |
|
1260 | 1260 | ) |
1261 | 1261 | ), |
1262 | 1262 | 'accounting' => new EE_Text_Input( |
@@ -1264,9 +1264,9 @@ discard block |
||
1264 | 1264 | 'default' => '', |
1265 | 1265 | 'required' => false, |
1266 | 1266 | 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
1267 | - 'validation_strategies' => array( |
|
1268 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1269 | - ) |
|
1267 | + 'validation_strategies' => array( |
|
1268 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1269 | + ) |
|
1270 | 1270 | ) |
1271 | 1271 | ), |
1272 | 1272 | ) |
@@ -1561,10 +1561,10 @@ discard block |
||
1561 | 1561 | /** |
1562 | 1562 | * delete_payment |
1563 | 1563 | * delete a payment or refund made towards a transaction |
1564 | - * |
|
1564 | + * |
|
1565 | 1565 | * @access public |
1566 | - * @return void |
|
1567 | - */ |
|
1566 | + * @return void |
|
1567 | + */ |
|
1568 | 1568 | public function delete_payment() { |
1569 | 1569 | $json_response_data = array( 'return_data' => FALSE ); |
1570 | 1570 | $PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0; |
@@ -1682,12 +1682,12 @@ discard block |
||
1682 | 1682 | /** |
1683 | 1683 | * _send_payment_reminder |
1684 | 1684 | * generates HTML for the View Transaction Details Admin page |
1685 | - * |
|
1685 | + * |
|
1686 | 1686 | * @access protected |
1687 | - * @return void |
|
1688 | - */ |
|
1687 | + * @return void |
|
1688 | + */ |
|
1689 | 1689 | protected function _send_payment_reminder() { |
1690 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1690 | + $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1691 | 1691 | $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
1692 | 1692 | $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
1693 | 1693 | do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
@@ -1709,29 +1709,29 @@ discard block |
||
1709 | 1709 | |
1710 | 1710 | $TXN = EEM_Transaction::instance(); |
1711 | 1711 | |
1712 | - $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1713 | - $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1712 | + $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1713 | + $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1714 | 1714 | |
1715 | - //make sure our timestamps start and end right at the boundaries for each day |
|
1716 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1717 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1715 | + //make sure our timestamps start and end right at the boundaries for each day |
|
1716 | + $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1717 | + $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1718 | 1718 | |
1719 | 1719 | |
1720 | - //convert to timestamps |
|
1721 | - $start_date = strtotime( $start_date ); |
|
1722 | - $end_date = strtotime( $end_date ); |
|
1720 | + //convert to timestamps |
|
1721 | + $start_date = strtotime( $start_date ); |
|
1722 | + $end_date = strtotime( $end_date ); |
|
1723 | 1723 | |
1724 | - //makes sure start date is the lowest value and vice versa |
|
1725 | - $start_date = min( $start_date, $end_date ); |
|
1726 | - $end_date = max( $start_date, $end_date ); |
|
1724 | + //makes sure start date is the lowest value and vice versa |
|
1725 | + $start_date = min( $start_date, $end_date ); |
|
1726 | + $end_date = max( $start_date, $end_date ); |
|
1727 | 1727 | |
1728 | - //convert to correct format for query |
|
1728 | + //convert to correct format for query |
|
1729 | 1729 | $start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' ); |
1730 | 1730 | $end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' ); |
1731 | 1731 | |
1732 | 1732 | |
1733 | 1733 | |
1734 | - //set orderby |
|
1734 | + //set orderby |
|
1735 | 1735 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1736 | 1736 | |
1737 | 1737 | switch ( $this->_req_data['orderby'] ) { |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param bool $routing |
57 | 57 | * @return Transactions_Admin_Page |
58 | 58 | */ |
59 | - public function __construct( $routing = TRUE ) { |
|
60 | - parent::__construct( $routing ); |
|
59 | + public function __construct($routing = TRUE) { |
|
60 | + parent::__construct($routing); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return void |
81 | 81 | */ |
82 | 82 | protected function _ajax_hooks() { |
83 | - add_action('wp_ajax_espresso_apply_payment', array( $this, 'apply_payments_or_refunds')); |
|
84 | - add_action('wp_ajax_espresso_apply_refund', array( $this, 'apply_payments_or_refunds')); |
|
85 | - add_action('wp_ajax_espresso_delete_payment', array( $this, 'delete_payment')); |
|
83 | + add_action('wp_ajax_espresso_apply_payment', array($this, 'apply_payments_or_refunds')); |
|
84 | + add_action('wp_ajax_espresso_apply_refund', array($this, 'apply_payments_or_refunds')); |
|
85 | + add_action('wp_ajax_espresso_delete_payment', array($this, 'delete_payment')); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | 'buttons' => array( |
98 | 98 | 'add' => __('Add New Transaction', 'event_espresso'), |
99 | 99 | 'edit' => __('Edit Transaction', 'event_espresso'), |
100 | - 'delete' => __('Delete Transaction','event_espresso'), |
|
100 | + 'delete' => __('Delete Transaction', 'event_espresso'), |
|
101 | 101 | ) |
102 | 102 | ); |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $this->_set_transaction_status_array(); |
115 | 115 | |
116 | - $txn_id = ! empty( $this->_req_data['TXN_ID'] ) && ! is_array( $this->_req_data['TXN_ID'] ) ? $this->_req_data['TXN_ID'] : 0; |
|
116 | + $txn_id = ! empty($this->_req_data['TXN_ID']) && ! is_array($this->_req_data['TXN_ID']) ? $this->_req_data['TXN_ID'] : 0; |
|
117 | 117 | |
118 | 118 | $this->_page_routes = array( |
119 | 119 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | 'filename' => 'transactions_overview_views_filters_search' |
186 | 186 | ), |
187 | 187 | ), |
188 | - 'help_tour' => array( 'Transactions_Overview_Help_Tour' ), |
|
188 | + 'help_tour' => array('Transactions_Overview_Help_Tour'), |
|
189 | 189 | /** |
190 | 190 | * commented out because currently we are not displaying tips for transaction list table status but this |
191 | 191 | * may change in a later iteration so want to keep the code for then. |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | 'nav' => array( |
198 | 198 | 'label' => __('View Transaction', 'event_espresso'), |
199 | 199 | 'order' => 5, |
200 | - 'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
|
200 | + 'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID']), $this->_current_page_view_url) : $this->_admin_base_url, |
|
201 | 201 | 'persistent' => FALSE |
202 | 202 | ), |
203 | 203 | 'help_tabs' => array( |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | 'filename' => 'transactions_view_transaction_primary_registrant_billing_information' |
219 | 219 | ), |
220 | 220 | ), |
221 | - 'qtips' => array( 'Transaction_Details_Tips' ), |
|
222 | - 'help_tour' => array( 'Transaction_Details_Help_Tour' ), |
|
221 | + 'qtips' => array('Transaction_Details_Tips'), |
|
222 | + 'help_tour' => array('Transaction_Details_Help_Tour'), |
|
223 | 223 | 'metaboxes' => array('_transaction_details_metaboxes'), |
224 | 224 | |
225 | 225 | 'require_nonce' => FALSE |
@@ -237,21 +237,21 @@ discard block |
||
237 | 237 | // IF a registration was JUST added via the admin... |
238 | 238 | if ( |
239 | 239 | isset( |
240 | - $this->_req_data[ 'redirect_from' ], |
|
241 | - $this->_req_data[ 'EVT_ID' ], |
|
242 | - $this->_req_data[ 'event_name' ] |
|
240 | + $this->_req_data['redirect_from'], |
|
241 | + $this->_req_data['EVT_ID'], |
|
242 | + $this->_req_data['event_name'] |
|
243 | 243 | ) |
244 | 244 | ) { |
245 | 245 | // then set a cookie so that we can block any attempts to use |
246 | 246 | // the back button as a way to enter another registration. |
247 | - setcookie( 'ee_registration_added', $this->_req_data[ 'EVT_ID' ], time() + WEEK_IN_SECONDS, '/' ); |
|
247 | + setcookie('ee_registration_added', $this->_req_data['EVT_ID'], time() + WEEK_IN_SECONDS, '/'); |
|
248 | 248 | // and update the global |
249 | - $_COOKIE[ 'ee_registration_added' ] = $this->_req_data[ 'EVT_ID' ]; |
|
249 | + $_COOKIE['ee_registration_added'] = $this->_req_data['EVT_ID']; |
|
250 | 250 | } |
251 | - EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = __( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' ); |
|
252 | - EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' ); |
|
253 | - EE_Registry::$i18n_js_strings[ 'txn_status_array' ] = self::$_txn_status; |
|
254 | - EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status; |
|
251 | + EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso'); |
|
252 | + EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso'); |
|
253 | + EE_Registry::$i18n_js_strings['txn_status_array'] = self::$_txn_status; |
|
254 | + EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status; |
|
255 | 255 | } |
256 | 256 | public function admin_notices() {} |
257 | 257 | public function admin_footer_scripts() {} |
@@ -318,14 +318,14 @@ discard block |
||
318 | 318 | */ |
319 | 319 | public function load_scripts_styles() { |
320 | 320 | //enqueue style |
321 | - wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION ); |
|
321 | + wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION); |
|
322 | 322 | wp_enqueue_style('espresso_txn'); |
323 | 323 | |
324 | 324 | //scripts |
325 | 325 | add_filter('FHEE_load_accounting_js', '__return_true'); |
326 | 326 | |
327 | 327 | //scripts |
328 | - wp_register_script('espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE); |
|
328 | + wp_register_script('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE); |
|
329 | 329 | wp_enqueue_script('espresso_txn'); |
330 | 330 | |
331 | 331 | } |
@@ -365,8 +365,8 @@ discard block |
||
365 | 365 | * @return void |
366 | 366 | */ |
367 | 367 | protected function _set_list_table_views_default() { |
368 | - $this->_views = array ( |
|
369 | - 'all' => array ( |
|
368 | + $this->_views = array( |
|
369 | + 'all' => array( |
|
370 | 370 | 'slug' => 'all', |
371 | 371 | 'label' => __('View All Transactions', 'event_espresso'), |
372 | 372 | 'count' => 0 |
@@ -394,20 +394,20 @@ discard block |
||
394 | 394 | * @return void |
395 | 395 | */ |
396 | 396 | private function _set_transaction_object() { |
397 | - if ( is_object( $this->_transaction) ) |
|
397 | + if (is_object($this->_transaction)) |
|
398 | 398 | return; //get out we've already set the object |
399 | 399 | |
400 | 400 | $TXN = EEM_Transaction::instance(); |
401 | 401 | |
402 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
402 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
403 | 403 | |
404 | 404 | //get transaction object |
405 | 405 | $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
406 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
406 | + $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
407 | 407 | |
408 | - if ( empty( $this->_transaction ) ) { |
|
409 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
410 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
408 | + if (empty($this->_transaction)) { |
|
409 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.__(' could not be retrieved.', 'event_espresso'); |
|
410 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
411 | 411 | } |
412 | 412 | } |
413 | 413 | |
@@ -420,12 +420,12 @@ discard block |
||
420 | 420 | * @return array |
421 | 421 | */ |
422 | 422 | protected function _transaction_legend_items() { |
423 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
423 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
424 | 424 | $items = array(); |
425 | 425 | |
426 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) { |
|
427 | - $related_for_icon = EEH_MSG_Template::get_message_action_icon( 'see_notifications_for' ); |
|
428 | - if ( isset( $related_for_icon['css_class']) && isset( $related_for_icon['label'] ) ) { |
|
426 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) { |
|
427 | + $related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for'); |
|
428 | + if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) { |
|
429 | 429 | $items['view_related_messages'] = array( |
430 | 430 | 'class' => $related_for_icon['css_class'], |
431 | 431 | 'desc' => $related_for_icon['label'], |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | |
436 | 436 | $items = apply_filters( |
437 | 437 | 'FHEE__Transactions_Admin_Page___transaction_legend_items__items', |
438 | - array_merge( $items, |
|
438 | + array_merge($items, |
|
439 | 439 | array( |
440 | 440 | 'view_details' => array( |
441 | 441 | 'class' => 'dashicons dashicons-cart', |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | ), |
448 | 448 | 'view_receipt' => array( |
449 | 449 | 'class' => 'dashicons dashicons-media-default', |
450 | - 'desc' => __('View Transaction Receipt', 'event_espresso' ) |
|
450 | + 'desc' => __('View Transaction Receipt', 'event_espresso') |
|
451 | 451 | ), |
452 | 452 | 'view_registration' => array( |
453 | 453 | 'class' => 'dashicons dashicons-clipboard', |
@@ -457,8 +457,8 @@ discard block |
||
457 | 457 | ) |
458 | 458 | ); |
459 | 459 | |
460 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) { |
|
461 | - if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) { |
|
460 | + if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) { |
|
461 | + if (EEH_MSG_Template::is_mt_active('payment_reminder')) { |
|
462 | 462 | $items['send_payment_reminder'] = array( |
463 | 463 | 'class' => 'dashicons dashicons-email-alt', |
464 | 464 | 'desc' => __('Send Payment Reminder', 'event_espresso') |
@@ -479,29 +479,29 @@ discard block |
||
479 | 479 | 'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items', |
480 | 480 | array( |
481 | 481 | 'overpaid' => array( |
482 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code, |
|
483 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' ) |
|
482 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code, |
|
483 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence') |
|
484 | 484 | ), |
485 | 485 | 'complete' => array( |
486 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code, |
|
487 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' ) |
|
486 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code, |
|
487 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence') |
|
488 | 488 | ), |
489 | 489 | 'incomplete' => array( |
490 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code, |
|
491 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' ) |
|
490 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code, |
|
491 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence') |
|
492 | 492 | ), |
493 | 493 | 'abandoned' => array( |
494 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code, |
|
495 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' ) |
|
494 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code, |
|
495 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence') |
|
496 | 496 | ), |
497 | 497 | 'failed' => array( |
498 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code, |
|
499 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' ) |
|
498 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code, |
|
499 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence') |
|
500 | 500 | ) |
501 | 501 | ) |
502 | 502 | ); |
503 | 503 | |
504 | - return array_merge( $items, $more_items); |
|
504 | + return array_merge($items, $more_items); |
|
505 | 505 | } |
506 | 506 | |
507 | 507 | |
@@ -514,9 +514,9 @@ discard block |
||
514 | 514 | */ |
515 | 515 | protected function _transactions_overview_list_table() { |
516 | 516 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
517 | - $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL; |
|
518 | - $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL ) . '" title="' . esc_attr__('Click to Edit event', 'event_espresso') . '">' . $event->get('EVT_name') . '</a>', '</h3>' ) : ''; |
|
519 | - $this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() ); |
|
517 | + $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL; |
|
518 | + $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'" title="'.esc_attr__('Click to Edit event', 'event_espresso').'">'.$event->get('EVT_name').'</a>', '</h3>') : ''; |
|
519 | + $this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items()); |
|
520 | 520 | $this->display_admin_list_table_page_with_no_sidebar(); |
521 | 521 | } |
522 | 522 | |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | * @return void |
531 | 531 | */ |
532 | 532 | protected function _transaction_details() { |
533 | - do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
|
533 | + do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction); |
|
534 | 534 | |
535 | 535 | $this->_set_transaction_status_array(); |
536 | 536 | |
@@ -543,14 +543,14 @@ discard block |
||
543 | 543 | $attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL; |
544 | 544 | |
545 | 545 | $this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID(); |
546 | - $this->_template_args['txn_nmbr']['label'] = __( 'Transaction Number', 'event_espresso' ); |
|
546 | + $this->_template_args['txn_nmbr']['label'] = __('Transaction Number', 'event_espresso'); |
|
547 | 547 | |
548 | 548 | $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_i18n_datetime('TXN_timestamp'); |
549 | - $this->_template_args['txn_datetime']['label'] = __( 'Date', 'event_espresso' ); |
|
549 | + $this->_template_args['txn_datetime']['label'] = __('Date', 'event_espresso'); |
|
550 | 550 | |
551 | - $this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ]; |
|
552 | - $this->_template_args['txn_status']['label'] = __( 'Transaction Status', 'event_espresso' ); |
|
553 | - $this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID'); |
|
551 | + $this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')]; |
|
552 | + $this->_template_args['txn_status']['label'] = __('Transaction Status', 'event_espresso'); |
|
553 | + $this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID'); |
|
554 | 554 | |
555 | 555 | $this->_template_args['grand_total'] = $this->_transaction->get('TXN_total'); |
556 | 556 | $this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid'); |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | ) |
564 | 564 | ) { |
565 | 565 | $this->_template_args['send_payment_reminder_button'] = |
566 | - EEH_MSG_Template::is_mt_active( 'payment_reminder' ) |
|
566 | + EEH_MSG_Template::is_mt_active('payment_reminder') |
|
567 | 567 | && $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code |
568 | 568 | && $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code |
569 | 569 | ? EEH_Template::get_button_or_link( |
@@ -585,40 +585,40 @@ discard block |
||
585 | 585 | } |
586 | 586 | |
587 | 587 | $amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid'); |
588 | - $this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE ); |
|
589 | - if ( EE_Registry::instance()->CFG->currency->sign_b4 ) { |
|
590 | - $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due']; |
|
588 | + $this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE); |
|
589 | + if (EE_Registry::instance()->CFG->currency->sign_b4) { |
|
590 | + $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due']; |
|
591 | 591 | } else { |
592 | - $this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign; |
|
592 | + $this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign; |
|
593 | 593 | } |
594 | - $this->_template_args['amount_due_class'] = ''; |
|
594 | + $this->_template_args['amount_due_class'] = ''; |
|
595 | 595 | |
596 | - if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) { |
|
596 | + if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) { |
|
597 | 597 | // paid in full |
598 | - $this->_template_args['amount_due'] = FALSE; |
|
599 | - } elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) { |
|
598 | + $this->_template_args['amount_due'] = FALSE; |
|
599 | + } elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) { |
|
600 | 600 | // overpaid |
601 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
602 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) { |
|
601 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
602 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) { |
|
603 | 603 | // monies owing |
604 | - $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
605 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) { |
|
604 | + $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
605 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) { |
|
606 | 606 | // no payments made yet |
607 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
608 | - } elseif ( $this->_transaction->get('TXN_total') == 0 ) { |
|
607 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
608 | + } elseif ($this->_transaction->get('TXN_total') == 0) { |
|
609 | 609 | // free event |
610 | - $this->_template_args['amount_due'] = FALSE; |
|
610 | + $this->_template_args['amount_due'] = FALSE; |
|
611 | 611 | } |
612 | 612 | |
613 | 613 | $payment_method = $this->_transaction->payment_method(); |
614 | 614 | |
615 | 615 | $this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method |
616 | 616 | ? $payment_method->admin_name() |
617 | - : __( 'Unknown', 'event_espresso' ); |
|
617 | + : __('Unknown', 'event_espresso'); |
|
618 | 618 | |
619 | 619 | $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign; |
620 | 620 | // link back to overview |
621 | - $this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] ) |
|
621 | + $this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER']) |
|
622 | 622 | ? $_SERVER['HTTP_REFERER'] |
623 | 623 | : TXN_ADMIN_URL; |
624 | 624 | |
@@ -626,13 +626,13 @@ discard block |
||
626 | 626 | // next link |
627 | 627 | $next_txn = $this->_transaction->next( |
628 | 628 | null, |
629 | - array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), |
|
629 | + array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), |
|
630 | 630 | 'TXN_ID' |
631 | 631 | ); |
632 | 632 | $this->_template_args['next_transaction'] = $next_txn |
633 | 633 | ? $this->_next_link( |
634 | 634 | EE_Admin_Page::add_query_args_and_nonce( |
635 | - array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ), |
|
635 | + array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']), |
|
636 | 636 | TXN_ADMIN_URL |
637 | 637 | ), |
638 | 638 | 'dashicons dashicons-arrow-right ee-icon-size-22' |
@@ -641,13 +641,13 @@ discard block |
||
641 | 641 | // previous link |
642 | 642 | $previous_txn = $this->_transaction->previous( |
643 | 643 | null, |
644 | - array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), |
|
644 | + array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), |
|
645 | 645 | 'TXN_ID' |
646 | 646 | ); |
647 | 647 | $this->_template_args['previous_transaction'] = $previous_txn |
648 | 648 | ? $this->_previous_link( |
649 | 649 | EE_Admin_Page::add_query_args_and_nonce( |
650 | - array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ), |
|
650 | + array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']), |
|
651 | 651 | TXN_ADMIN_URL |
652 | 652 | ), |
653 | 653 | 'dashicons dashicons-arrow-left ee-icon-size-22' |
@@ -657,16 +657,16 @@ discard block |
||
657 | 657 | // were we just redirected here after adding a new registration ??? |
658 | 658 | if ( |
659 | 659 | isset( |
660 | - $this->_req_data[ 'redirect_from' ], |
|
661 | - $this->_req_data[ 'EVT_ID' ], |
|
662 | - $this->_req_data[ 'event_name' ] |
|
660 | + $this->_req_data['redirect_from'], |
|
661 | + $this->_req_data['EVT_ID'], |
|
662 | + $this->_req_data['event_name'] |
|
663 | 663 | ) |
664 | 664 | ) { |
665 | 665 | if ( |
666 | 666 | EE_Registry::instance()->CAP->current_user_can( |
667 | 667 | 'ee_edit_registrations', |
668 | 668 | 'espresso_registrations_new_registration', |
669 | - $this->_req_data[ 'EVT_ID' ] |
|
669 | + $this->_req_data['EVT_ID'] |
|
670 | 670 | ) |
671 | 671 | ) { |
672 | 672 | $this->_admin_page_title .= '<a id="add-new-registration" class="add-new-h2 button-primary" href="'; |
@@ -676,7 +676,7 @@ discard block |
||
676 | 676 | 'action' => 'new_registration', |
677 | 677 | 'return' => 'default', |
678 | 678 | 'TXN_ID' => $this->_transaction->ID(), |
679 | - 'event_id' => $this->_req_data[ 'EVT_ID' ], |
|
679 | + 'event_id' => $this->_req_data['EVT_ID'], |
|
680 | 680 | ), |
681 | 681 | REG_ADMIN_URL |
682 | 682 | ); |
@@ -684,17 +684,17 @@ discard block |
||
684 | 684 | |
685 | 685 | $this->_admin_page_title .= sprintf( |
686 | 686 | __('Add Another New Registration to Event: "%1$s" ?'), |
687 | - htmlentities( urldecode( $this->_req_data[ 'event_name' ] ), ENT_QUOTES, 'UTF-8' ) |
|
687 | + htmlentities(urldecode($this->_req_data['event_name']), ENT_QUOTES, 'UTF-8') |
|
688 | 688 | ); |
689 | 689 | $this->_admin_page_title .= '</a>'; |
690 | 690 | } |
691 | - EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ ); |
|
691 | + EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__); |
|
692 | 692 | } |
693 | 693 | // grab messages at the last second |
694 | 694 | $this->_template_args['notices'] = EE_Error::get_notices(); |
695 | 695 | // path to template |
696 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php'; |
|
697 | - $this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
696 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php'; |
|
697 | + $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
698 | 698 | |
699 | 699 | // the details template wrapper |
700 | 700 | $this->display_admin_page_with_sidebar(); |
@@ -713,18 +713,18 @@ discard block |
||
713 | 713 | |
714 | 714 | $this->_set_transaction_object(); |
715 | 715 | |
716 | - add_meta_box( 'edit-txn-details-mbox', __( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' ); |
|
716 | + add_meta_box('edit-txn-details-mbox', __('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high'); |
|
717 | 717 | add_meta_box( |
718 | 718 | 'edit-txn-attendees-mbox', |
719 | - __( 'Attendees Registered in this Transaction', 'event_espresso' ), |
|
720 | - array( $this, 'txn_attendees_meta_box' ), |
|
719 | + __('Attendees Registered in this Transaction', 'event_espresso'), |
|
720 | + array($this, 'txn_attendees_meta_box'), |
|
721 | 721 | $this->_wp_page_slug, |
722 | 722 | 'normal', |
723 | 723 | 'high', |
724 | - array( 'TXN_ID' => $this->_transaction->ID() ) |
|
724 | + array('TXN_ID' => $this->_transaction->ID()) |
|
725 | 725 | ); |
726 | - add_meta_box( 'edit-txn-registrant-mbox', __( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
727 | - add_meta_box( 'edit-txn-billing-info-mbox', __( 'Billing Information', 'event_espresso' ), array( $this, 'txn_billing_info_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
726 | + add_meta_box('edit-txn-registrant-mbox', __('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
727 | + add_meta_box('edit-txn-billing-info-mbox', __('Billing Information', 'event_espresso'), array($this, 'txn_billing_info_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
728 | 728 | |
729 | 729 | } |
730 | 730 | |
@@ -745,15 +745,15 @@ discard block |
||
745 | 745 | |
746 | 746 | //get line table |
747 | 747 | EEH_Autoloader::register_line_item_display_autoloaders(); |
748 | - $Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' ); |
|
749 | - $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() ); |
|
748 | + $Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy'); |
|
749 | + $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item()); |
|
750 | 750 | $this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code'); |
751 | 751 | |
752 | 752 | // process taxes |
753 | - $taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax ))); |
|
754 | - $this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE; |
|
753 | + $taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax))); |
|
754 | + $this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE; |
|
755 | 755 | |
756 | - $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE ); |
|
756 | + $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE); |
|
757 | 757 | $this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total'); |
758 | 758 | $this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID'); |
759 | 759 | |
@@ -761,63 +761,63 @@ discard block |
||
761 | 761 | |
762 | 762 | // process payment details |
763 | 763 | $payments = $this->_transaction->get_many_related('Payment'); |
764 | - if( ! empty( $payments ) ) { |
|
765 | - $this->_template_args[ 'payments' ] = $payments; |
|
766 | - $this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments ); |
|
764 | + if ( ! empty($payments)) { |
|
765 | + $this->_template_args['payments'] = $payments; |
|
766 | + $this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments); |
|
767 | 767 | } else { |
768 | - $this->_template_args[ 'payments' ] = false; |
|
769 | - $this->_template_args[ 'existing_reg_payments' ] = array(); |
|
768 | + $this->_template_args['payments'] = false; |
|
769 | + $this->_template_args['existing_reg_payments'] = array(); |
|
770 | 770 | } |
771 | 771 | |
772 | - $this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment' ), TXN_ADMIN_URL ); |
|
773 | - $this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL ); |
|
772 | + $this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL); |
|
773 | + $this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL); |
|
774 | 774 | |
775 | - if ( isset( $txn_details['invoice_number'] )) { |
|
775 | + if (isset($txn_details['invoice_number'])) { |
|
776 | 776 | $this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code']; |
777 | - $this->_template_args['txn_details']['invoice_number']['label'] = __( 'Invoice Number', 'event_espresso' ); |
|
777 | + $this->_template_args['txn_details']['invoice_number']['label'] = __('Invoice Number', 'event_espresso'); |
|
778 | 778 | } |
779 | 779 | |
780 | 780 | $this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session'); |
781 | - $this->_template_args['txn_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' ); |
|
781 | + $this->_template_args['txn_details']['registration_session']['label'] = __('Registration Session', 'event_espresso'); |
|
782 | 782 | |
783 | - $this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : ''; |
|
784 | - $this->_template_args['txn_details']['ip_address']['label'] = __( 'Transaction placed from IP', 'event_espresso' ); |
|
783 | + $this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : ''; |
|
784 | + $this->_template_args['txn_details']['ip_address']['label'] = __('Transaction placed from IP', 'event_espresso'); |
|
785 | 785 | |
786 | - $this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : ''; |
|
787 | - $this->_template_args['txn_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' ); |
|
786 | + $this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : ''; |
|
787 | + $this->_template_args['txn_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso'); |
|
788 | 788 | |
789 | 789 | $reg_steps = '<ul>'; |
790 | - foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) { |
|
791 | - if ( $reg_step_status === true ) { |
|
792 | - $reg_steps .= '<li style="color:#70cc50">' . sprintf( __( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
793 | - } else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) { |
|
794 | - $reg_steps .= '<li style="color:#2EA2CC">' . sprintf( |
|
795 | - __( '%1$s : Initiated %2$s', 'event_espresso' ), |
|
796 | - ucwords( str_replace( '_', ' ', $reg_step ) ), |
|
797 | - gmdate( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) ) |
|
798 | - ) . '</li>'; |
|
790 | + foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) { |
|
791 | + if ($reg_step_status === true) { |
|
792 | + $reg_steps .= '<li style="color:#70cc50">'.sprintf(__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
793 | + } else if (is_numeric($reg_step_status) && $reg_step_status !== false) { |
|
794 | + $reg_steps .= '<li style="color:#2EA2CC">'.sprintf( |
|
795 | + __('%1$s : Initiated %2$s', 'event_espresso'), |
|
796 | + ucwords(str_replace('_', ' ', $reg_step)), |
|
797 | + gmdate(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS))) |
|
798 | + ).'</li>'; |
|
799 | 799 | } else { |
800 | - $reg_steps .= '<li style="color:#E76700">' . sprintf( __( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
800 | + $reg_steps .= '<li style="color:#E76700">'.sprintf(__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
801 | 801 | } |
802 | 802 | } |
803 | 803 | $reg_steps .= '</ul>'; |
804 | 804 | $this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps; |
805 | - $this->_template_args['txn_details']['reg_steps']['label'] = __( 'Registration Step Progress', 'event_espresso' ); |
|
805 | + $this->_template_args['txn_details']['reg_steps']['label'] = __('Registration Step Progress', 'event_espresso'); |
|
806 | 806 | |
807 | 807 | |
808 | 808 | $this->_get_registrations_to_apply_payment_to(); |
809 | - $this->_get_payment_methods( $payments ); |
|
809 | + $this->_get_payment_methods($payments); |
|
810 | 810 | $this->_get_payment_status_array(); |
811 | 811 | $this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction. |
812 | 812 | |
813 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction' ), TXN_ADMIN_URL ); |
|
814 | - $this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL ); |
|
815 | - $this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL ); |
|
813 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL); |
|
814 | + $this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL); |
|
815 | + $this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL); |
|
816 | 816 | |
817 | 817 | // 'espresso_delete_payment_nonce' |
818 | 818 | |
819 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
820 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
819 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
820 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
821 | 821 | |
822 | 822 | } |
823 | 823 | |
@@ -832,27 +832,27 @@ discard block |
||
832 | 832 | * @param EE_Payment[] $payments |
833 | 833 | * @return array |
834 | 834 | */ |
835 | - protected function _get_registration_payment_IDs( $payments = array() ) { |
|
835 | + protected function _get_registration_payment_IDs($payments = array()) { |
|
836 | 836 | $existing_reg_payments = array(); |
837 | 837 | // get all reg payments for these payments |
838 | - $reg_payments = EEM_Registration_Payment::instance()->get_all( array( |
|
838 | + $reg_payments = EEM_Registration_Payment::instance()->get_all(array( |
|
839 | 839 | array( |
840 | 840 | 'PAY_ID' => array( |
841 | 841 | 'IN', |
842 | - array_keys( $payments ) |
|
842 | + array_keys($payments) |
|
843 | 843 | ) |
844 | 844 | ) |
845 | - ) ); |
|
846 | - if ( ! empty( $reg_payments ) ) { |
|
847 | - foreach ( $payments as $payment ) { |
|
848 | - if ( ! $payment instanceof EE_Payment ) { |
|
845 | + )); |
|
846 | + if ( ! empty($reg_payments)) { |
|
847 | + foreach ($payments as $payment) { |
|
848 | + if ( ! $payment instanceof EE_Payment) { |
|
849 | 849 | continue; |
850 | - } else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) { |
|
851 | - $existing_reg_payments[ $payment->ID() ] = array(); |
|
850 | + } else if ( ! isset($existing_reg_payments[$payment->ID()])) { |
|
851 | + $existing_reg_payments[$payment->ID()] = array(); |
|
852 | 852 | } |
853 | - foreach ( $reg_payments as $reg_payment ) { |
|
854 | - if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) { |
|
855 | - $existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID(); |
|
853 | + foreach ($reg_payments as $reg_payment) { |
|
854 | + if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) { |
|
855 | + $existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID(); |
|
856 | 856 | } |
857 | 857 | } |
858 | 858 | } |
@@ -889,39 +889,39 @@ discard block |
||
889 | 889 | $registrations_to_apply_payment_to .= '<br /><div class="admin-primary-mbox-tbl-wrap">'; |
890 | 890 | $registrations_to_apply_payment_to .= '<table class="admin-primary-mbox-tbl">'; |
891 | 891 | $registrations_to_apply_payment_to .= '<thead><tr>'; |
892 | - $registrations_to_apply_payment_to .= '<td>' . __( 'ID', 'event_espresso' ) . '</td>'; |
|
893 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Registrant', 'event_espresso' ) . '</td>'; |
|
894 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Ticket', 'event_espresso' ) . '</td>'; |
|
895 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Event', 'event_espresso' ) . '</td>'; |
|
896 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">' . __( 'Paid', 'event_espresso' ) . '</td>'; |
|
897 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">' . __( 'Owing', 'event_espresso' ) . '</td>'; |
|
898 | - $registrations_to_apply_payment_to .= '<td class="jst-cntr">' . __( 'Apply', 'event_espresso' ) . '</td>'; |
|
892 | + $registrations_to_apply_payment_to .= '<td>'.__('ID', 'event_espresso').'</td>'; |
|
893 | + $registrations_to_apply_payment_to .= '<td>'.__('Registrant', 'event_espresso').'</td>'; |
|
894 | + $registrations_to_apply_payment_to .= '<td>'.__('Ticket', 'event_espresso').'</td>'; |
|
895 | + $registrations_to_apply_payment_to .= '<td>'.__('Event', 'event_espresso').'</td>'; |
|
896 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">'.__('Paid', 'event_espresso').'</td>'; |
|
897 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">'.__('Owing', 'event_espresso').'</td>'; |
|
898 | + $registrations_to_apply_payment_to .= '<td class="jst-cntr">'.__('Apply', 'event_espresso').'</td>'; |
|
899 | 899 | $registrations_to_apply_payment_to .= '</tr></thead><tbody>'; |
900 | 900 | // get registrations for TXN |
901 | - $registrations = $this->_transaction->registrations( $query_params ); |
|
902 | - foreach ( $registrations as $registration ) { |
|
903 | - if ( $registration instanceof EE_Registration ) { |
|
901 | + $registrations = $this->_transaction->registrations($query_params); |
|
902 | + foreach ($registrations as $registration) { |
|
903 | + if ($registration instanceof EE_Registration) { |
|
904 | 904 | $owing = $registration->final_price() - $registration->paid(); |
905 | - $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> ' . __( '+ tax', 'event_espresso' ) . '</span>' : ''; |
|
906 | - $checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments ) ? ' checked="checked"' : ''; |
|
907 | - $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-' . $registration->ID() . '">'; |
|
905 | + $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> '.__('+ tax', 'event_espresso').'</span>' : ''; |
|
906 | + $checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments) ? ' checked="checked"' : ''; |
|
907 | + $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-'.$registration->ID().'">'; |
|
908 | 908 | // add html for checkbox input and label |
909 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ID() . '</td>'; |
|
910 | - $registrations_to_apply_payment_to .= '<td>' . $registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ) . '</td>'; |
|
911 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable . '</td>'; |
|
912 | - $registrations_to_apply_payment_to .= '<td>' . $registration->event_name() . '</td>'; |
|
913 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">' . $registration->pretty_paid() . '</td>'; |
|
914 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">' . EEH_Template::format_currency( $owing ) . '</td>'; |
|
909 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ID().'</td>'; |
|
910 | + $registrations_to_apply_payment_to .= '<td>'.$registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __('Unknown Attendee', 'event_espresso').'</td>'; |
|
911 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable.'</td>'; |
|
912 | + $registrations_to_apply_payment_to .= '<td>'.$registration->event_name().'</td>'; |
|
913 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">'.$registration->pretty_paid().'</td>'; |
|
914 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">'.EEH_Template::format_currency($owing).'</td>'; |
|
915 | 915 | $registrations_to_apply_payment_to .= '<td class="jst-cntr">'; |
916 | 916 | $disabled = $registration->final_price() > 0 ? '' : ' disabled'; |
917 | - $registrations_to_apply_payment_to .= '<input type="checkbox" value="' . $registration->ID() . '" name="txn_admin_payment[registrations]"' . $checked . $disabled . '>'; |
|
917 | + $registrations_to_apply_payment_to .= '<input type="checkbox" value="'.$registration->ID().'" name="txn_admin_payment[registrations]"'.$checked.$disabled.'>'; |
|
918 | 918 | $registrations_to_apply_payment_to .= '</td>'; |
919 | 919 | $registrations_to_apply_payment_to .= '</tr>'; |
920 | 920 | } |
921 | 921 | } |
922 | 922 | $registrations_to_apply_payment_to .= '</tbody></table></div>'; |
923 | - $registrations_to_apply_payment_to .= '<p class="clear description">' . __( 'The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso' ) . '</p></div>'; |
|
924 | - $this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to; |
|
923 | + $registrations_to_apply_payment_to .= '<p class="clear description">'.__('The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso').'</p></div>'; |
|
924 | + $this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to; |
|
925 | 925 | } |
926 | 926 | |
927 | 927 | |
@@ -938,9 +938,9 @@ discard block |
||
938 | 938 | $statuses = EEM_Registration::reg_status_array(array(), TRUE); |
939 | 939 | //let's add a "don't change" option. |
940 | 940 | $status_array['NAN'] = __('Leave the Same', 'event_espresso'); |
941 | - $status_array = array_merge( $status_array, $statuses ); |
|
942 | - $this->_template_args['status_change_select'] = EEH_Form_Fields::select_input( 'txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status' ); |
|
943 | - $this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input( 'delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status' ); |
|
941 | + $status_array = array_merge($status_array, $statuses); |
|
942 | + $this->_template_args['status_change_select'] = EEH_Form_Fields::select_input('txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status'); |
|
943 | + $this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input('delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status'); |
|
944 | 944 | |
945 | 945 | } |
946 | 946 | |
@@ -955,21 +955,21 @@ discard block |
||
955 | 955 | * @param EE_Payment[] to show on this page |
956 | 956 | * @return void |
957 | 957 | */ |
958 | - private function _get_payment_methods( $payments = array() ) { |
|
958 | + private function _get_payment_methods($payments = array()) { |
|
959 | 959 | $payment_methods_of_payments = array(); |
960 | - foreach( $payments as $payment ){ |
|
961 | - if( $payment instanceof EE_Payment ){ |
|
962 | - $payment_methods_of_payments[] = $payment->get( 'PMD_ID' ); |
|
960 | + foreach ($payments as $payment) { |
|
961 | + if ($payment instanceof EE_Payment) { |
|
962 | + $payment_methods_of_payments[] = $payment->get('PMD_ID'); |
|
963 | 963 | } |
964 | 964 | } |
965 | - if( $payment_methods_of_payments ){ |
|
966 | - $query_args = array( array( 'OR*payment_method_for_payment' => array( |
|
967 | - 'PMD_ID' => array( 'IN', $payment_methods_of_payments ), |
|
968 | - 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) ); |
|
969 | - }else{ |
|
970 | - $query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ); |
|
965 | + if ($payment_methods_of_payments) { |
|
966 | + $query_args = array(array('OR*payment_method_for_payment' => array( |
|
967 | + 'PMD_ID' => array('IN', $payment_methods_of_payments), |
|
968 | + 'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') ))); |
|
969 | + } else { |
|
970 | + $query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%'))); |
|
971 | 971 | } |
972 | - $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args ); |
|
972 | + $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args); |
|
973 | 973 | } |
974 | 974 | |
975 | 975 | |
@@ -983,46 +983,46 @@ discard block |
||
983 | 983 | * @param array $metabox |
984 | 984 | * @return void |
985 | 985 | */ |
986 | - public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) { |
|
986 | + public function txn_attendees_meta_box($post, $metabox = array('args' => array())) { |
|
987 | 987 | |
988 | - extract( $metabox['args'] ); |
|
988 | + extract($metabox['args']); |
|
989 | 989 | $this->_template_args['post'] = $post; |
990 | 990 | $this->_template_args['event_attendees'] = array(); |
991 | 991 | // process items in cart |
992 | - $line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) ); |
|
993 | - if ( ! empty( $line_items )) { |
|
994 | - foreach ( $line_items as $item ) { |
|
995 | - if ( $item instanceof EE_Line_Item ) { |
|
996 | - switch( $item->OBJ_type() ) { |
|
992 | + $line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item'))); |
|
993 | + if ( ! empty($line_items)) { |
|
994 | + foreach ($line_items as $item) { |
|
995 | + if ($item instanceof EE_Line_Item) { |
|
996 | + switch ($item->OBJ_type()) { |
|
997 | 997 | |
998 | 998 | case 'Event' : |
999 | 999 | break; |
1000 | 1000 | |
1001 | 1001 | case 'Ticket' : |
1002 | 1002 | $ticket = $item->ticket(); |
1003 | - if ( empty( $ticket )) { |
|
1003 | + if (empty($ticket)) { |
|
1004 | 1004 | continue; //right now we're only handling tickets here. Cause its expected that only tickets will have attendees right? |
1005 | 1005 | } |
1006 | - $ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' )); |
|
1006 | + $ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price')); |
|
1007 | 1007 | $event = $ticket->get_first_related('Registration')->get_first_related('Event'); |
1008 | - $event_name = $event instanceof EE_Event ? $event->get('EVT_name') . ' - ' . $item->get('LIN_name') : ''; |
|
1008 | + $event_name = $event instanceof EE_Event ? $event->get('EVT_name').' - '.$item->get('LIN_name') : ''; |
|
1009 | 1009 | |
1010 | - $registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() ))); |
|
1011 | - foreach( $registrations as $registration ) { |
|
1012 | - $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
1013 | - $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
1014 | - $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
1010 | + $registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID()))); |
|
1011 | + foreach ($registrations as $registration) { |
|
1012 | + $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
1013 | + $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
1014 | + $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
1015 | 1015 | // attendee info |
1016 | 1016 | $attendee = $registration->get_first_related('Attendee'); |
1017 | - if ( $attendee instanceof EE_Attendee ) { |
|
1017 | + if ($attendee instanceof EE_Attendee) { |
|
1018 | 1018 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = $attendee->ID(); |
1019 | 1019 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = $attendee->full_name(); |
1020 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:' . $attendee->email() . '?subject=' . $event->get('EVT_name') . __(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>'; |
|
1021 | - $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array() ); |
|
1020 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event->get('EVT_name').__(' Event', 'event_espresso').'">'.$attendee->email().'</a>'; |
|
1021 | + $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array()); |
|
1022 | 1022 | } else { |
1023 | 1023 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = ''; |
1024 | 1024 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = ''; |
1025 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
1025 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
1026 | 1026 | $this->_template_args['event_attendees'][$registration->ID()]['address'] = ''; |
1027 | 1027 | } |
1028 | 1028 | } |
@@ -1032,12 +1032,12 @@ discard block |
||
1032 | 1032 | } |
1033 | 1033 | } |
1034 | 1034 | |
1035 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees' ), TXN_ADMIN_URL ); |
|
1036 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE ); |
|
1035 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL); |
|
1036 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE); |
|
1037 | 1037 | |
1038 | 1038 | } else { |
1039 | 1039 | echo sprintf( |
1040 | - __( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ), |
|
1040 | + __('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'), |
|
1041 | 1041 | '<p class="important-notice">', |
1042 | 1042 | '</p>' |
1043 | 1043 | ); |
@@ -1056,19 +1056,19 @@ discard block |
||
1056 | 1056 | */ |
1057 | 1057 | public function txn_registrant_side_meta_box() { |
1058 | 1058 | $primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null; |
1059 | - if ( ! $primary_att instanceof EE_Attendee ) { |
|
1059 | + if ( ! $primary_att instanceof EE_Attendee) { |
|
1060 | 1060 | $this->_template_args['no_attendee_message'] = __('There is no attached contact for this transaction. The transaction either failed due to an error or was abandoned.', 'event_espresso'); |
1061 | 1061 | $primary_att = EEM_Attendee::instance()->create_default_object(); |
1062 | 1062 | } |
1063 | - $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
1063 | + $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
1064 | 1064 | $this->_template_args['prime_reg_fname'] = $primary_att->fname(); |
1065 | 1065 | $this->_template_args['prime_reg_lname'] = $primary_att->lname(); |
1066 | - $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
1066 | + $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
1067 | 1067 | $this->_template_args['prime_reg_phone'] = $primary_att->phone(); |
1068 | - $this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit_attendee', 'post' => $primary_att->ID() ), REG_ADMIN_URL ); |
|
1068 | + $this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit_attendee', 'post' => $primary_att->ID()), REG_ADMIN_URL); |
|
1069 | 1069 | // get formatted address for registrant |
1070 | - $this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att ); |
|
1071 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE ); |
|
1070 | + $this->_template_args['formatted_address'] = EEH_Address::format($primary_att); |
|
1071 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE); |
|
1072 | 1072 | } |
1073 | 1073 | |
1074 | 1074 | |
@@ -1084,12 +1084,12 @@ discard block |
||
1084 | 1084 | |
1085 | 1085 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
1086 | 1086 | $this->_template_args['billing_form_url'] = add_query_arg( |
1087 | - array( 'action' => 'edit_transaction', 'process' => 'billing' ), |
|
1087 | + array('action' => 'edit_transaction', 'process' => 'billing'), |
|
1088 | 1088 | TXN_ADMIN_URL |
1089 | 1089 | ); |
1090 | 1090 | |
1091 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
1092 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/ |
|
1091 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
1092 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/ |
|
1093 | 1093 | } |
1094 | 1094 | |
1095 | 1095 | |
@@ -1102,42 +1102,42 @@ discard block |
||
1102 | 1102 | * @return void |
1103 | 1103 | */ |
1104 | 1104 | public function apply_payments_or_refunds() { |
1105 | - $json_response_data = array( 'return_data' => FALSE ); |
|
1105 | + $json_response_data = array('return_data' => FALSE); |
|
1106 | 1106 | $valid_data = $this->_validate_payment_request_data(); |
1107 | - if ( ! empty( $valid_data ) ) { |
|
1108 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
1107 | + if ( ! empty($valid_data)) { |
|
1108 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1109 | 1109 | //save the new payment |
1110 | - $payment = $this->_create_payment_from_request_data( $valid_data ); |
|
1110 | + $payment = $this->_create_payment_from_request_data($valid_data); |
|
1111 | 1111 | // get the TXN for this payment |
1112 | 1112 | $transaction = $payment->transaction(); |
1113 | 1113 | // verify transaction |
1114 | - if ( $transaction instanceof EE_Transaction ) { |
|
1114 | + if ($transaction instanceof EE_Transaction) { |
|
1115 | 1115 | // calculate_total_payments_and_update_status |
1116 | - $this->_process_transaction_payments( $transaction ); |
|
1117 | - $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment ); |
|
1118 | - $this->_remove_existing_registration_payments( $payment, $PAY_ID ); |
|
1116 | + $this->_process_transaction_payments($transaction); |
|
1117 | + $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment); |
|
1118 | + $this->_remove_existing_registration_payments($payment, $PAY_ID); |
|
1119 | 1119 | // apply payment to registrations (if applicable) |
1120 | - if ( ! empty( $REG_IDs ) ) { |
|
1121 | - $this->_update_registration_payments( $transaction, $payment, $REG_IDs ); |
|
1120 | + if ( ! empty($REG_IDs)) { |
|
1121 | + $this->_update_registration_payments($transaction, $payment, $REG_IDs); |
|
1122 | 1122 | $this->_maybe_send_notifications(); |
1123 | 1123 | // now process status changes for the same registrations |
1124 | - $this->_process_registration_status_change( $transaction, $REG_IDs ); |
|
1124 | + $this->_process_registration_status_change($transaction, $REG_IDs); |
|
1125 | 1125 | } |
1126 | - $this->_maybe_send_notifications( $payment ); |
|
1126 | + $this->_maybe_send_notifications($payment); |
|
1127 | 1127 | //prepare to render page |
1128 | - $json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs ); |
|
1129 | - do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment ); |
|
1128 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs); |
|
1129 | + do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment); |
|
1130 | 1130 | } else { |
1131 | 1131 | EE_Error::add_error( |
1132 | - __( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ), |
|
1132 | + __('A valid Transaction for this payment could not be retrieved.', 'event_espresso'), |
|
1133 | 1133 | __FILE__, __FUNCTION__, __LINE__ |
1134 | 1134 | ); |
1135 | 1135 | } |
1136 | 1136 | } else { |
1137 | - EE_Error::add_error( __( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1137 | + EE_Error::add_error(__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1138 | 1138 | } |
1139 | 1139 | |
1140 | - $notices = EE_Error::get_notices( false, false, false ); |
|
1140 | + $notices = EE_Error::get_notices(false, false, false); |
|
1141 | 1141 | $this->_template_args = array( |
1142 | 1142 | 'data' => $json_response_data, |
1143 | 1143 | 'error' => $notices['errors'], |
@@ -1154,30 +1154,30 @@ discard block |
||
1154 | 1154 | * @return array |
1155 | 1155 | */ |
1156 | 1156 | protected function _validate_payment_request_data() { |
1157 | - if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) { |
|
1157 | + if ( ! isset($this->_req_data['txn_admin_payment'])) { |
|
1158 | 1158 | return false; |
1159 | 1159 | } |
1160 | 1160 | $payment_form = $this->_generate_payment_form_section(); |
1161 | 1161 | try { |
1162 | - if ( $payment_form->was_submitted() ) { |
|
1162 | + if ($payment_form->was_submitted()) { |
|
1163 | 1163 | $payment_form->receive_form_submission(); |
1164 | - if ( ! $payment_form->is_valid() ) { |
|
1164 | + if ( ! $payment_form->is_valid()) { |
|
1165 | 1165 | $submission_error_messages = array(); |
1166 | - foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) { |
|
1167 | - if ( $validation_error instanceof EE_Validation_Error ) { |
|
1166 | + foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) { |
|
1167 | + if ($validation_error instanceof EE_Validation_Error) { |
|
1168 | 1168 | $submission_error_messages[] = sprintf( |
1169 | - _x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ), |
|
1169 | + _x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'), |
|
1170 | 1170 | $validation_error->get_form_section()->html_label_text(), |
1171 | 1171 | $validation_error->getMessage() |
1172 | 1172 | ); |
1173 | 1173 | } |
1174 | 1174 | } |
1175 | - EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1175 | + EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__); |
|
1176 | 1176 | return array(); |
1177 | 1177 | } |
1178 | 1178 | } |
1179 | - } catch ( EE_Error $e ) { |
|
1180 | - EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ ); |
|
1179 | + } catch (EE_Error $e) { |
|
1180 | + EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__); |
|
1181 | 1181 | return array(); |
1182 | 1182 | } |
1183 | 1183 | return $payment_form->valid_data(); |
@@ -1199,63 +1199,63 @@ discard block |
||
1199 | 1199 | array( |
1200 | 1200 | 'default' => 0, |
1201 | 1201 | 'required' => false, |
1202 | - 'html_label_text' => __( 'Payment ID', 'event_espresso' ), |
|
1203 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1202 | + 'html_label_text' => __('Payment ID', 'event_espresso'), |
|
1203 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1204 | 1204 | ) |
1205 | 1205 | ), |
1206 | 1206 | 'TXN_ID' => new EE_Text_Input( |
1207 | 1207 | array( |
1208 | 1208 | 'default' => 0, |
1209 | 1209 | 'required' => true, |
1210 | - 'html_label_text' => __( 'Transaction ID', 'event_espresso' ), |
|
1211 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1210 | + 'html_label_text' => __('Transaction ID', 'event_espresso'), |
|
1211 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1212 | 1212 | ) |
1213 | 1213 | ), |
1214 | 1214 | 'type' => new EE_Text_Input( |
1215 | 1215 | array( |
1216 | 1216 | 'default' => 1, |
1217 | 1217 | 'required' => true, |
1218 | - 'html_label_text' => __( 'Payment or Refund', 'event_espresso' ), |
|
1219 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1218 | + 'html_label_text' => __('Payment or Refund', 'event_espresso'), |
|
1219 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1220 | 1220 | ) |
1221 | 1221 | ), |
1222 | 1222 | 'amount' => new EE_Text_Input( |
1223 | 1223 | array( |
1224 | 1224 | 'default' => 0, |
1225 | 1225 | 'required' => true, |
1226 | - 'html_label_text' => __( 'Payment amount', 'event_espresso' ), |
|
1227 | - 'validation_strategies' => array( new EE_Float_Normalization() ) |
|
1226 | + 'html_label_text' => __('Payment amount', 'event_espresso'), |
|
1227 | + 'validation_strategies' => array(new EE_Float_Normalization()) |
|
1228 | 1228 | ) |
1229 | 1229 | ), |
1230 | 1230 | 'status' => new EE_Text_Input( |
1231 | 1231 | array( |
1232 | 1232 | 'default' => EEM_Payment::status_id_approved, |
1233 | 1233 | 'required' => true, |
1234 | - 'html_label_text' => __( 'Payment status', 'event_espresso' ), |
|
1234 | + 'html_label_text' => __('Payment status', 'event_espresso'), |
|
1235 | 1235 | ) |
1236 | 1236 | ), |
1237 | 1237 | 'PMD_ID' => new EE_Text_Input( |
1238 | 1238 | array( |
1239 | 1239 | 'default' => 2, |
1240 | 1240 | 'required' => true, |
1241 | - 'html_label_text' => __( 'Payment Method', 'event_espresso' ), |
|
1242 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1241 | + 'html_label_text' => __('Payment Method', 'event_espresso'), |
|
1242 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1243 | 1243 | ) |
1244 | 1244 | ), |
1245 | 1245 | 'date' => new EE_Text_Input( |
1246 | 1246 | array( |
1247 | 1247 | 'default' => time(), |
1248 | 1248 | 'required' => true, |
1249 | - 'html_label_text' => __( 'Payment date', 'event_espresso' ), |
|
1249 | + 'html_label_text' => __('Payment date', 'event_espresso'), |
|
1250 | 1250 | ) |
1251 | 1251 | ), |
1252 | 1252 | 'txn_id_chq_nmbr' => new EE_Text_Input( |
1253 | 1253 | array( |
1254 | 1254 | 'default' => '', |
1255 | 1255 | 'required' => false, |
1256 | - 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
|
1256 | + 'html_label_text' => __('Transaction or Cheque Number', 'event_espresso'), |
|
1257 | 1257 | 'validation_strategies' => array( |
1258 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1258 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1259 | 1259 | ) |
1260 | 1260 | ) |
1261 | 1261 | ), |
@@ -1263,9 +1263,9 @@ discard block |
||
1263 | 1263 | array( |
1264 | 1264 | 'default' => '', |
1265 | 1265 | 'required' => false, |
1266 | - 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
|
1266 | + 'html_label_text' => __('Purchase Order Number', 'event_espresso'), |
|
1267 | 1267 | 'validation_strategies' => array( |
1268 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1268 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1269 | 1269 | ) |
1270 | 1270 | ) |
1271 | 1271 | ), |
@@ -1273,9 +1273,9 @@ discard block |
||
1273 | 1273 | array( |
1274 | 1274 | 'default' => '', |
1275 | 1275 | 'required' => false, |
1276 | - 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
|
1276 | + 'html_label_text' => __('Extra Field for Accounting', 'event_espresso'), |
|
1277 | 1277 | 'validation_strategies' => array( |
1278 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1278 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1279 | 1279 | ) |
1280 | 1280 | ) |
1281 | 1281 | ), |
@@ -1292,37 +1292,37 @@ discard block |
||
1292 | 1292 | * @param array $valid_data |
1293 | 1293 | * @return EE_Payment |
1294 | 1294 | */ |
1295 | - protected function _create_payment_from_request_data( $valid_data ) { |
|
1296 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
1295 | + protected function _create_payment_from_request_data($valid_data) { |
|
1296 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1297 | 1297 | // get payment amount |
1298 | - $amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0; |
|
1298 | + $amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0; |
|
1299 | 1299 | // payments have a type value of 1 and refunds have a type value of -1 |
1300 | 1300 | // so multiplying amount by type will give a positive value for payments, and negative values for refunds |
1301 | - $amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount; |
|
1301 | + $amount = $valid_data['type'] < 0 ? $amount * -1 : $amount; |
|
1302 | 1302 | // for some reason the date string coming in has extra spaces between the date and time. This fixes that. |
1303 | - $date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) ); |
|
1303 | + $date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp')); |
|
1304 | 1304 | $payment = EE_Payment::new_instance( |
1305 | 1305 | array( |
1306 | - 'TXN_ID' => $valid_data[ 'TXN_ID' ], |
|
1307 | - 'STS_ID' => $valid_data[ 'status' ], |
|
1306 | + 'TXN_ID' => $valid_data['TXN_ID'], |
|
1307 | + 'STS_ID' => $valid_data['status'], |
|
1308 | 1308 | 'PAY_timestamp' => $date, |
1309 | 1309 | 'PAY_source' => EEM_Payment_Method::scope_admin, |
1310 | - 'PMD_ID' => $valid_data[ 'PMD_ID' ], |
|
1310 | + 'PMD_ID' => $valid_data['PMD_ID'], |
|
1311 | 1311 | 'PAY_amount' => $amount, |
1312 | - 'PAY_txn_id_chq_nmbr' => $valid_data[ 'txn_id_chq_nmbr' ], |
|
1313 | - 'PAY_po_number' => $valid_data[ 'po_number' ], |
|
1314 | - 'PAY_extra_accntng' => $valid_data[ 'accounting' ], |
|
1312 | + 'PAY_txn_id_chq_nmbr' => $valid_data['txn_id_chq_nmbr'], |
|
1313 | + 'PAY_po_number' => $valid_data['po_number'], |
|
1314 | + 'PAY_extra_accntng' => $valid_data['accounting'], |
|
1315 | 1315 | 'PAY_details' => $valid_data, |
1316 | 1316 | 'PAY_ID' => $PAY_ID |
1317 | 1317 | ), |
1318 | 1318 | '', |
1319 | - array( 'Y-m-d', 'g:i a' ) |
|
1319 | + array('Y-m-d', 'g:i a') |
|
1320 | 1320 | ); |
1321 | 1321 | |
1322 | - if ( ! $payment->save() ) { |
|
1322 | + if ( ! $payment->save()) { |
|
1323 | 1323 | EE_Error::add_error( |
1324 | 1324 | sprintf( |
1325 | - __( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ), |
|
1325 | + __('Payment %1$d has not been successfully saved to the database.', 'event_espresso'), |
|
1326 | 1326 | $payment->ID() |
1327 | 1327 | ), |
1328 | 1328 | __FILE__, __FUNCTION__, __LINE__ |
@@ -1339,15 +1339,15 @@ discard block |
||
1339 | 1339 | * @param \EE_Transaction $transaction |
1340 | 1340 | * @return array |
1341 | 1341 | */ |
1342 | - protected function _process_transaction_payments( EE_Transaction $transaction ) { |
|
1342 | + protected function _process_transaction_payments(EE_Transaction $transaction) { |
|
1343 | 1343 | /** @type EE_Transaction_Payments $transaction_payments */ |
1344 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1344 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1345 | 1345 | //update the transaction with this payment |
1346 | - if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) { |
|
1347 | - EE_Error::add_success( __( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1346 | + if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) { |
|
1347 | + EE_Error::add_success(__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1348 | 1348 | } else { |
1349 | 1349 | EE_Error::add_error( |
1350 | - __( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' ) |
|
1350 | + __('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso') |
|
1351 | 1351 | , __FILE__, __FUNCTION__, __LINE__ |
1352 | 1352 | ); |
1353 | 1353 | } |
@@ -1363,19 +1363,19 @@ discard block |
||
1363 | 1363 | * @param \EE_Payment $payment |
1364 | 1364 | * @return array |
1365 | 1365 | */ |
1366 | - protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) { |
|
1366 | + protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) { |
|
1367 | 1367 | $REG_IDs = array(); |
1368 | 1368 | // grab array of IDs for specific registrations to apply changes to |
1369 | - if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) { |
|
1370 | - $REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ]; |
|
1369 | + if (isset($this->_req_data['txn_admin_payment']['registrations'])) { |
|
1370 | + $REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations']; |
|
1371 | 1371 | } |
1372 | 1372 | //nothing specified ? then get all reg IDs |
1373 | - if ( empty( $REG_IDs ) ) { |
|
1373 | + if (empty($REG_IDs)) { |
|
1374 | 1374 | $registrations = $payment->transaction()->registrations(); |
1375 | - $REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1375 | + $REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1376 | 1376 | } |
1377 | 1377 | // ensure that REG_IDs are integers and NOT strings |
1378 | - return array_map( 'intval', $REG_IDs ); |
|
1378 | + return array_map('intval', $REG_IDs); |
|
1379 | 1379 | } |
1380 | 1380 | |
1381 | 1381 | |
@@ -1392,7 +1392,7 @@ discard block |
||
1392 | 1392 | /** |
1393 | 1393 | * @param array $existing_reg_payment_REG_IDs |
1394 | 1394 | */ |
1395 | - public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) { |
|
1395 | + public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) { |
|
1396 | 1396 | $this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs; |
1397 | 1397 | } |
1398 | 1398 | |
@@ -1407,13 +1407,13 @@ discard block |
||
1407 | 1407 | * @param \EE_Payment $payment |
1408 | 1408 | * @return array |
1409 | 1409 | */ |
1410 | - protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) { |
|
1411 | - if ( $this->existing_reg_payment_REG_IDs() === null ) { |
|
1410 | + protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) { |
|
1411 | + if ($this->existing_reg_payment_REG_IDs() === null) { |
|
1412 | 1412 | // let's get any existing reg payment records for this payment |
1413 | - $existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' ); |
|
1413 | + $existing_reg_payment_REG_IDs = $payment->get_many_related('Registration'); |
|
1414 | 1414 | // but we only want the REG IDs, so grab the array keys |
1415 | - $existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array(); |
|
1416 | - $this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs ); |
|
1415 | + $existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array(); |
|
1416 | + $this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs); |
|
1417 | 1417 | } |
1418 | 1418 | return $this->existing_reg_payment_REG_IDs(); |
1419 | 1419 | } |
@@ -1432,23 +1432,23 @@ discard block |
||
1432 | 1432 | * @param int $PAY_ID |
1433 | 1433 | * @return bool; |
1434 | 1434 | */ |
1435 | - protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) { |
|
1435 | + protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) { |
|
1436 | 1436 | // newly created payments will have nothing recorded for $PAY_ID |
1437 | - if ( $PAY_ID == 0 ) { |
|
1437 | + if ($PAY_ID == 0) { |
|
1438 | 1438 | return false; |
1439 | 1439 | } |
1440 | - $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1441 | - if ( empty( $existing_reg_payment_REG_IDs )) { |
|
1440 | + $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1441 | + if (empty($existing_reg_payment_REG_IDs)) { |
|
1442 | 1442 | return false; |
1443 | 1443 | } |
1444 | 1444 | /** @type EE_Transaction_Payments $transaction_payments */ |
1445 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1445 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1446 | 1446 | return $transaction_payments->delete_registration_payments_and_update_registrations( |
1447 | 1447 | $payment, |
1448 | 1448 | array( |
1449 | 1449 | array( |
1450 | 1450 | 'PAY_ID' => $payment->ID(), |
1451 | - 'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ), |
|
1451 | + 'REG_ID' => array('IN', $existing_reg_payment_REG_IDs), |
|
1452 | 1452 | ) |
1453 | 1453 | ) |
1454 | 1454 | ); |
@@ -1467,25 +1467,25 @@ discard block |
||
1467 | 1467 | * @param array $REG_IDs |
1468 | 1468 | * @return bool |
1469 | 1469 | */ |
1470 | - protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
|
1470 | + protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) { |
|
1471 | 1471 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
1472 | 1472 | // so let's do that using our set of REG_IDs from the form |
1473 | 1473 | $registration_query_where_params = array( |
1474 | - 'REG_ID' => array( 'IN', $REG_IDs ) |
|
1474 | + 'REG_ID' => array('IN', $REG_IDs) |
|
1475 | 1475 | ); |
1476 | 1476 | // but add in some conditions regarding payment, |
1477 | 1477 | // so that we don't apply payments to registrations that are free or have already been paid for |
1478 | 1478 | // but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative ) |
1479 | - if ( ! $payment->is_a_refund() ) { |
|
1480 | - $registration_query_where_params[ 'REG_final_price' ] = array( '!=', 0 ); |
|
1481 | - $registration_query_where_params[ 'REG_final_price*' ] = array( '!=', 'REG_paid', true ); |
|
1479 | + if ( ! $payment->is_a_refund()) { |
|
1480 | + $registration_query_where_params['REG_final_price'] = array('!=', 0); |
|
1481 | + $registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true); |
|
1482 | 1482 | } |
1483 | 1483 | //EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ ); |
1484 | - $registrations = $transaction->registrations( array( $registration_query_where_params ) ); |
|
1485 | - if ( ! empty( $registrations ) ) { |
|
1484 | + $registrations = $transaction->registrations(array($registration_query_where_params)); |
|
1485 | + if ( ! empty($registrations)) { |
|
1486 | 1486 | /** @type EE_Payment_Processor $payment_processor */ |
1487 | - $payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' ); |
|
1488 | - $payment_processor->process_registration_payments( $transaction, $payment, $registrations ); |
|
1487 | + $payment_processor = EE_Registry::instance()->load_core('Payment_Processor'); |
|
1488 | + $payment_processor->process_registration_payments($transaction, $payment, $registrations); |
|
1489 | 1489 | } |
1490 | 1490 | } |
1491 | 1491 | |
@@ -1501,22 +1501,22 @@ discard block |
||
1501 | 1501 | * @param array $REG_IDs |
1502 | 1502 | * @return bool |
1503 | 1503 | */ |
1504 | - protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) { |
|
1504 | + protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) { |
|
1505 | 1505 | // first if there is no change in status then we get out. |
1506 | 1506 | if ( |
1507 | - ! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ) |
|
1507 | + ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status']) |
|
1508 | 1508 | || $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN' |
1509 | 1509 | ) { |
1510 | 1510 | //no error message, no change requested, just nothing to do man. |
1511 | 1511 | return FALSE; |
1512 | 1512 | } |
1513 | 1513 | /** @type EE_Transaction_Processor $transaction_processor */ |
1514 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
1514 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
1515 | 1515 | // made it here dude? Oh WOW. K, let's take care of changing the statuses |
1516 | 1516 | return $transaction_processor->manually_update_registration_statuses( |
1517 | 1517 | $transaction, |
1518 | - sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ), |
|
1519 | - array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) |
|
1518 | + sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']), |
|
1519 | + array(array('REG_ID' => array('IN', $REG_IDs))) |
|
1520 | 1520 | ); |
1521 | 1521 | } |
1522 | 1522 | |
@@ -1531,16 +1531,16 @@ discard block |
||
1531 | 1531 | * @param bool | null $delete_txn_reg_status_change |
1532 | 1532 | * @return array |
1533 | 1533 | */ |
1534 | - protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) { |
|
1534 | + protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) { |
|
1535 | 1535 | // was the payment deleted ? |
1536 | - if ( is_bool( $delete_txn_reg_status_change )) { |
|
1536 | + if (is_bool($delete_txn_reg_status_change)) { |
|
1537 | 1537 | return array( |
1538 | 1538 | 'PAY_ID' => $payment->ID(), |
1539 | 1539 | 'amount' => $payment->amount(), |
1540 | 1540 | 'total_paid' => $payment->transaction()->paid(), |
1541 | 1541 | 'txn_status' => $payment->transaction()->status_ID(), |
1542 | 1542 | 'pay_status' => $payment->STS_ID(), |
1543 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1543 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1544 | 1544 | 'delete_txn_reg_status_change' => $delete_txn_reg_status_change, |
1545 | 1545 | ); |
1546 | 1546 | } else { |
@@ -1552,16 +1552,16 @@ discard block |
||
1552 | 1552 | 'pay_status' => $payment->STS_ID(), |
1553 | 1553 | 'PAY_ID' => $payment->ID(), |
1554 | 1554 | 'STS_ID' => $payment->STS_ID(), |
1555 | - 'status' => self::$_pay_status[ $payment->STS_ID() ], |
|
1556 | - 'date' => $payment->timestamp( 'Y-m-d', 'h:i a' ), |
|
1557 | - 'method' => strtoupper( $payment->source() ), |
|
1555 | + 'status' => self::$_pay_status[$payment->STS_ID()], |
|
1556 | + 'date' => $payment->timestamp('Y-m-d', 'h:i a'), |
|
1557 | + 'method' => strtoupper($payment->source()), |
|
1558 | 1558 | 'PM_ID' => $payment->payment_method() ? $payment->payment_method()->ID() : 1, |
1559 | - 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __( "Unknown", 'event_espresso' ), |
|
1559 | + 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'), |
|
1560 | 1560 | 'gateway_response' => $payment->gateway_response(), |
1561 | 1561 | 'txn_id_chq_nmbr' => $payment->txn_id_chq_nmbr(), |
1562 | 1562 | 'po_number' => $payment->po_number(), |
1563 | 1563 | 'extra_accntng' => $payment->extra_accntng(), |
1564 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1564 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1565 | 1565 | ); |
1566 | 1566 | } |
1567 | 1567 | } |
@@ -1576,39 +1576,39 @@ discard block |
||
1576 | 1576 | * @return void |
1577 | 1577 | */ |
1578 | 1578 | public function delete_payment() { |
1579 | - $json_response_data = array( 'return_data' => FALSE ); |
|
1580 | - $PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0; |
|
1581 | - if ( $PAY_ID ) { |
|
1582 | - $delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false; |
|
1583 | - $payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID ); |
|
1584 | - if ( $payment instanceof EE_Payment ) { |
|
1585 | - $REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1579 | + $json_response_data = array('return_data' => FALSE); |
|
1580 | + $PAY_ID = isset($this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID']) ? absint($this->_req_data['delete_txn_admin_payment']['PAY_ID']) : 0; |
|
1581 | + if ($PAY_ID) { |
|
1582 | + $delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false; |
|
1583 | + $payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID); |
|
1584 | + if ($payment instanceof EE_Payment) { |
|
1585 | + $REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1586 | 1586 | /** @type EE_Transaction_Payments $transaction_payments */ |
1587 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1588 | - if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) { |
|
1589 | - $json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change ); |
|
1590 | - if ( $delete_txn_reg_status_change ) { |
|
1587 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1588 | + if ($transaction_payments->delete_payment_and_update_transaction($payment)) { |
|
1589 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change); |
|
1590 | + if ($delete_txn_reg_status_change) { |
|
1591 | 1591 | $this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1592 | 1592 | //MAKE sure we also add the delete_txn_req_status_change to the |
1593 | 1593 | //$_REQUEST global because that's how messages will be looking for it. |
1594 | 1594 | $_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1595 | 1595 | $this->_maybe_send_notifications(); |
1596 | - $this->_process_registration_status_change( $payment->transaction(), $REG_IDs ); |
|
1596 | + $this->_process_registration_status_change($payment->transaction(), $REG_IDs); |
|
1597 | 1597 | } |
1598 | 1598 | } |
1599 | 1599 | } else { |
1600 | 1600 | EE_Error::add_error( |
1601 | - __( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ), |
|
1601 | + __('Valid Payment data could not be retrieved from the database.', 'event_espresso'), |
|
1602 | 1602 | __FILE__, __FUNCTION__, __LINE__ |
1603 | 1603 | ); |
1604 | 1604 | } |
1605 | 1605 | } else { |
1606 | 1606 | EE_Error::add_error( |
1607 | - __( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ), |
|
1607 | + __('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'), |
|
1608 | 1608 | __FILE__, __FUNCTION__, __LINE__ |
1609 | 1609 | ); |
1610 | 1610 | } |
1611 | - $notices = EE_Error::get_notices( false, false, false); |
|
1611 | + $notices = EE_Error::get_notices(false, false, false); |
|
1612 | 1612 | $this->_template_args = array( |
1613 | 1613 | 'data' => $json_response_data, |
1614 | 1614 | 'success' => $notices['success'], |
@@ -1628,16 +1628,16 @@ discard block |
||
1628 | 1628 | * @param array $REG_IDs |
1629 | 1629 | * @return array |
1630 | 1630 | */ |
1631 | - protected function _registration_payment_data_array( $REG_IDs ) { |
|
1631 | + protected function _registration_payment_data_array($REG_IDs) { |
|
1632 | 1632 | $registration_payment_data = array(); |
1633 | 1633 | //if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows. |
1634 | - if ( ! empty( $REG_IDs ) ) { |
|
1635 | - $registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) ); |
|
1636 | - foreach ( $registrations as $registration ) { |
|
1637 | - if ( $registration instanceof EE_Registration ) { |
|
1638 | - $registration_payment_data[ $registration->ID() ] = array( |
|
1634 | + if ( ! empty($REG_IDs)) { |
|
1635 | + $registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs)))); |
|
1636 | + foreach ($registrations as $registration) { |
|
1637 | + if ($registration instanceof EE_Registration) { |
|
1638 | + $registration_payment_data[$registration->ID()] = array( |
|
1639 | 1639 | 'paid' => $registration->pretty_paid(), |
1640 | - 'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ), |
|
1640 | + 'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()), |
|
1641 | 1641 | ); |
1642 | 1642 | } |
1643 | 1643 | } |
@@ -1657,30 +1657,30 @@ discard block |
||
1657 | 1657 | * @access protected |
1658 | 1658 | * @param \EE_Payment | null $payment |
1659 | 1659 | */ |
1660 | - protected function _maybe_send_notifications( $payment = null ) { |
|
1661 | - switch ( $payment instanceof EE_Payment ) { |
|
1660 | + protected function _maybe_send_notifications($payment = null) { |
|
1661 | + switch ($payment instanceof EE_Payment) { |
|
1662 | 1662 | // payment notifications |
1663 | 1663 | case true : |
1664 | 1664 | if ( |
1665 | 1665 | isset( |
1666 | - $this->_req_data[ 'txn_payments' ], |
|
1667 | - $this->_req_data[ 'txn_payments' ][ 'send_notifications' ] |
|
1666 | + $this->_req_data['txn_payments'], |
|
1667 | + $this->_req_data['txn_payments']['send_notifications'] |
|
1668 | 1668 | ) && |
1669 | - filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1669 | + filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1670 | 1670 | ) { |
1671 | - $this->_process_payment_notification( $payment ); |
|
1671 | + $this->_process_payment_notification($payment); |
|
1672 | 1672 | } |
1673 | 1673 | break; |
1674 | 1674 | // registration notifications |
1675 | 1675 | case false : |
1676 | 1676 | if ( |
1677 | 1677 | isset( |
1678 | - $this->_req_data[ 'txn_reg_status_change' ], |
|
1679 | - $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] |
|
1678 | + $this->_req_data['txn_reg_status_change'], |
|
1679 | + $this->_req_data['txn_reg_status_change']['send_notifications'] |
|
1680 | 1680 | ) && |
1681 | - filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1681 | + filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1682 | 1682 | ) { |
1683 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' ); |
|
1683 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true'); |
|
1684 | 1684 | } |
1685 | 1685 | break; |
1686 | 1686 | } |
@@ -1696,11 +1696,11 @@ discard block |
||
1696 | 1696 | * @return void |
1697 | 1697 | */ |
1698 | 1698 | protected function _send_payment_reminder() { |
1699 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1700 | - $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
|
1701 | - $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
|
1702 | - do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
|
1703 | - $this->_redirect_after_action( FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE ); |
|
1699 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
1700 | + $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID); |
|
1701 | + $query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array(); |
|
1702 | + do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction); |
|
1703 | + $this->_redirect_after_action(FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE); |
|
1704 | 1704 | } |
1705 | 1705 | |
1706 | 1706 | |
@@ -1714,36 +1714,36 @@ discard block |
||
1714 | 1714 | * @param string $view |
1715 | 1715 | * @return mixed int = count || array of transaction objects |
1716 | 1716 | */ |
1717 | - public function get_transactions( $perpage, $count = FALSE, $view = '' ) { |
|
1717 | + public function get_transactions($perpage, $count = FALSE, $view = '') { |
|
1718 | 1718 | |
1719 | 1719 | $TXN = EEM_Transaction::instance(); |
1720 | 1720 | |
1721 | - $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1722 | - $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1721 | + $start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year')); |
|
1722 | + $end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y'); |
|
1723 | 1723 | |
1724 | 1724 | //make sure our timestamps start and end right at the boundaries for each day |
1725 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1726 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1725 | + $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00'; |
|
1726 | + $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59'; |
|
1727 | 1727 | |
1728 | 1728 | |
1729 | 1729 | //convert to timestamps |
1730 | - $start_date = strtotime( $start_date ); |
|
1731 | - $end_date = strtotime( $end_date ); |
|
1730 | + $start_date = strtotime($start_date); |
|
1731 | + $end_date = strtotime($end_date); |
|
1732 | 1732 | |
1733 | 1733 | //makes sure start date is the lowest value and vice versa |
1734 | - $start_date = min( $start_date, $end_date ); |
|
1735 | - $end_date = max( $start_date, $end_date ); |
|
1734 | + $start_date = min($start_date, $end_date); |
|
1735 | + $end_date = max($start_date, $end_date); |
|
1736 | 1736 | |
1737 | 1737 | //convert to correct format for query |
1738 | - $start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' ); |
|
1739 | - $end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' ); |
|
1738 | + $start_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s'); |
|
1739 | + $end_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s'); |
|
1740 | 1740 | |
1741 | 1741 | |
1742 | 1742 | |
1743 | 1743 | //set orderby |
1744 | 1744 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1745 | 1745 | |
1746 | - switch ( $this->_req_data['orderby'] ) { |
|
1746 | + switch ($this->_req_data['orderby']) { |
|
1747 | 1747 | case 'TXN_ID': |
1748 | 1748 | $orderby = 'TXN_ID'; |
1749 | 1749 | break; |
@@ -1757,66 +1757,66 @@ discard block |
||
1757 | 1757 | $orderby = 'TXN_timestamp'; |
1758 | 1758 | } |
1759 | 1759 | |
1760 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC'; |
|
1761 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
1762 | - $per_page = isset( $perpage ) && !empty( $perpage ) ? $perpage : 10; |
|
1763 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
1760 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC'; |
|
1761 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
1762 | + $per_page = isset($perpage) && ! empty($perpage) ? $perpage : 10; |
|
1763 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
1764 | 1764 | |
1765 | - $offset = ($current_page-1)*$per_page; |
|
1766 | - $limit = array( $offset, $per_page ); |
|
1765 | + $offset = ($current_page - 1) * $per_page; |
|
1766 | + $limit = array($offset, $per_page); |
|
1767 | 1767 | |
1768 | 1768 | $_where = array( |
1769 | - 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ), |
|
1769 | + 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)), |
|
1770 | 1770 | 'Registration.REG_count' => 1 |
1771 | 1771 | ); |
1772 | 1772 | |
1773 | - if ( isset( $this->_req_data['EVT_ID'] ) ) { |
|
1773 | + if (isset($this->_req_data['EVT_ID'])) { |
|
1774 | 1774 | $_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID']; |
1775 | 1775 | } |
1776 | 1776 | |
1777 | - if ( isset( $this->_req_data['s'] ) ) { |
|
1778 | - $search_string = '%' . $this->_req_data['s'] . '%'; |
|
1777 | + if (isset($this->_req_data['s'])) { |
|
1778 | + $search_string = '%'.$this->_req_data['s'].'%'; |
|
1779 | 1779 | $_where['OR'] = array( |
1780 | - 'Registration.Event.EVT_name' => array( 'LIKE', $search_string ), |
|
1781 | - 'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ), |
|
1782 | - 'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ), |
|
1783 | - 'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ), |
|
1784 | - 'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ), |
|
1785 | - 'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ), |
|
1786 | - 'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ), |
|
1787 | - 'Registration.Attendee.ATT_email' => array('LIKE', $search_string ), |
|
1788 | - 'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ), |
|
1789 | - 'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ), |
|
1790 | - 'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ), |
|
1791 | - 'Registration.REG_final_price' => array( 'LIKE', $search_string ), |
|
1792 | - 'Registration.REG_code' => array( 'LIKE', $search_string ), |
|
1793 | - 'Registration.REG_count' => array( 'LIKE' , $search_string ), |
|
1794 | - 'Registration.REG_group_size' => array( 'LIKE' , $search_string ), |
|
1795 | - 'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ), |
|
1796 | - 'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ), |
|
1797 | - 'Payment.PAY_source' => array('LIKE', $search_string ), |
|
1798 | - 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ), |
|
1799 | - 'TXN_session_data' => array( 'LIKE', $search_string ), |
|
1800 | - 'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string ) |
|
1780 | + 'Registration.Event.EVT_name' => array('LIKE', $search_string), |
|
1781 | + 'Registration.Event.EVT_desc' => array('LIKE', $search_string), |
|
1782 | + 'Registration.Event.EVT_short_desc' => array('LIKE', $search_string), |
|
1783 | + 'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string), |
|
1784 | + 'Registration.Attendee.ATT_fname' => array('LIKE', $search_string), |
|
1785 | + 'Registration.Attendee.ATT_lname' => array('LIKE', $search_string), |
|
1786 | + 'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string), |
|
1787 | + 'Registration.Attendee.ATT_email' => array('LIKE', $search_string), |
|
1788 | + 'Registration.Attendee.ATT_address' => array('LIKE', $search_string), |
|
1789 | + 'Registration.Attendee.ATT_address2' => array('LIKE', $search_string), |
|
1790 | + 'Registration.Attendee.ATT_city' => array('LIKE', $search_string), |
|
1791 | + 'Registration.REG_final_price' => array('LIKE', $search_string), |
|
1792 | + 'Registration.REG_code' => array('LIKE', $search_string), |
|
1793 | + 'Registration.REG_count' => array('LIKE', $search_string), |
|
1794 | + 'Registration.REG_group_size' => array('LIKE', $search_string), |
|
1795 | + 'Registration.Ticket.TKT_name' => array('LIKE', $search_string), |
|
1796 | + 'Registration.Ticket.TKT_description' => array('LIKE', $search_string), |
|
1797 | + 'Payment.PAY_source' => array('LIKE', $search_string), |
|
1798 | + 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string), |
|
1799 | + 'TXN_session_data' => array('LIKE', $search_string), |
|
1800 | + 'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string) |
|
1801 | 1801 | ); |
1802 | 1802 | } |
1803 | 1803 | |
1804 | 1804 | //failed transactions |
1805 | - $failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE; |
|
1806 | - $abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE; |
|
1805 | + $failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE : FALSE; |
|
1806 | + $abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE : FALSE; |
|
1807 | 1807 | |
1808 | - if ( $failed ) { |
|
1809 | - $_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code; |
|
1810 | - } else if ( $abandoned ) { |
|
1808 | + if ($failed) { |
|
1809 | + $_where['STS_ID'] = EEM_Transaction::failed_status_code; |
|
1810 | + } else if ($abandoned) { |
|
1811 | 1811 | $_where['STS_ID'] = EEM_Transaction::abandoned_status_code; |
1812 | 1812 | } else { |
1813 | - $_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code ); |
|
1814 | - $_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code ); |
|
1813 | + $_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code); |
|
1814 | + $_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code); |
|
1815 | 1815 | } |
1816 | 1816 | |
1817 | - $query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit ); |
|
1817 | + $query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit); |
|
1818 | 1818 | |
1819 | - $transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params); |
|
1819 | + $transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params); |
|
1820 | 1820 | |
1821 | 1821 | |
1822 | 1822 | return $transactions; |
@@ -67,11 +67,11 @@ |
||
67 | 67 | </li> |
68 | 68 | <li style="list-style-type: none;"> |
69 | 69 | <strong><?php _e('View Registration Details <span class="dashicons dashicons-clipboard"></span>', 'event_espresso'); ?></strong><br /> |
70 | -<?php echo sprintf(__('Clicking this icon will take you to the registration page for this transaction. You can also get there via the %sRegistrations page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_registrations">','</a>'); ?> |
|
70 | +<?php echo sprintf(__('Clicking this icon will take you to the registration page for this transaction. You can also get there via the %sRegistrations page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_registrations">', '</a>'); ?> |
|
71 | 71 | </li> |
72 | 72 | <li style="list-style-type: none;"> |
73 | 73 | <strong><?php _e('Send Payment Reminder <span class="dashicons dashicons-email-alt"></span>', 'event_espresso'); ?></strong><br /> |
74 | -<?php echo sprintf(__('Emails the primary registrant the Payment Reminder message. This is set up in the %sMessages page%s.', 'event_espresso'),'<a href="admin.php?page=espresso_messages">','</a>'); ?> |
|
74 | +<?php echo sprintf(__('Emails the primary registrant the Payment Reminder message. This is set up in the %sMessages page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_messages">', '</a>'); ?> |
|
75 | 75 | </li> |
76 | 76 | </ul> |
77 | 77 | </li> |