@@ -4,33 +4,33 @@ discard block |
||
4 | 4 | <?php echo $resend_registration_button; ?> |
5 | 5 | <br/> |
6 | 6 | |
7 | - <h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e( 'Registration Items', 'event_espresso' );?></h3> |
|
7 | + <h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e('Registration Items', 'event_espresso'); ?></h3> |
|
8 | 8 | |
9 | 9 | <?php echo $line_item_table; ?> |
10 | 10 | |
11 | 11 | <?php |
12 | - if ( WP_DEBUG ) { |
|
13 | - $delivered_messages = get_option( 'EED_Messages__maybe_registration', array() ); |
|
14 | - if ( isset( $delivered_messages[ $REG_ID ] )) { |
|
12 | + if (WP_DEBUG) { |
|
13 | + $delivered_messages = get_option('EED_Messages__maybe_registration', array()); |
|
14 | + if (isset($delivered_messages[$REG_ID])) { |
|
15 | 15 | ?> |
16 | - <h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Registrant', 'event_espresso' );?></h4> |
|
16 | + <h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Registrant', 'event_espresso'); ?></h4> |
|
17 | 17 | |
18 | 18 | <div class="admin-primary-mbox-tbl-wrap"> |
19 | 19 | <table class="admin-primary-mbox-tbl"> |
20 | 20 | <thead> |
21 | 21 | <tr> |
22 | - <th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th> |
|
23 | - <th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th> |
|
24 | - <th class="jst-left"><?php _e( 'REG Status Upon Sending', 'event_espresso' );?></th> |
|
22 | + <th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th> |
|
23 | + <th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th> |
|
24 | + <th class="jst-left"><?php _e('REG Status Upon Sending', 'event_espresso'); ?></th> |
|
25 | 25 | </tr> |
26 | 26 | </thead> |
27 | 27 | <tbody> |
28 | - <?php foreach ( $delivered_messages[ $REG_ID ] as $timestamp => $delivered_message ) : |
|
28 | + <?php foreach ($delivered_messages[$REG_ID] as $timestamp => $delivered_message) : |
|
29 | 29 | ?> |
30 | 30 | <tr> |
31 | - <td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td> |
|
32 | - <td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td> |
|
33 | - <td class="jst-left"><?php echo isset( $delivered_message['reg_status'] ) ? $delivered_message['reg_status'] : '';?></td> |
|
31 | + <td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td> |
|
32 | + <td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td> |
|
33 | + <td class="jst-left"><?php echo isset($delivered_message['reg_status']) ? $delivered_message['reg_status'] : ''; ?></td> |
|
34 | 34 | </tr> |
35 | 35 | <?php endforeach; // $delivered_messages?> |
36 | 36 | </tbody> |
@@ -42,27 +42,27 @@ discard block |
||
42 | 42 | ?> |
43 | 43 | |
44 | 44 | <a id="display-additional-registration-session-info" class="display-the-hidden smaller-text" rel="additional-registration-session-info"> |
45 | - <span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional registration session details', 'event_espresso' );?> |
|
45 | + <span class="dashicons dashicons-plus-alt"></span><?php _e('view additional registration session details', 'event_espresso'); ?> |
|
46 | 46 | </a> |
47 | 47 | |
48 | 48 | <div id="additional-registration-session-info-dv" class="hidden"> |
49 | 49 | |
50 | 50 | <a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-registration-session-info"> |
51 | - <span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional registration session details', 'event_espresso' );?> |
|
51 | + <span class="dashicons dashicons-dismiss"></span><?php _e('hide additional registration session details', 'event_espresso'); ?> |
|
52 | 52 | </a> |
53 | 53 | <br class="clear"/> |
54 | 54 | |
55 | - <h3 class="admin-primary-mbox-h4"><?php _e( 'Registration Session Details', 'event_espresso' );?></h3> |
|
55 | + <h3 class="admin-primary-mbox-h4"><?php _e('Registration Session Details', 'event_espresso'); ?></h3> |
|
56 | 56 | |
57 | 57 | <table id="admin-primary-mbox-reg-extra-session-info-tbl" class="form-table skinny-rows"> |
58 | 58 | <tbody> |
59 | - <?php foreach ( $reg_details as $key => $reg_detail ) : ?> |
|
59 | + <?php foreach ($reg_details as $key => $reg_detail) : ?> |
|
60 | 60 | <tr> |
61 | 61 | <th> |
62 | - <label for="<?php echo $key;?>"><?php echo $reg_detail['label'];?></label> |
|
62 | + <label for="<?php echo $key; ?>"><?php echo $reg_detail['label']; ?></label> |
|
63 | 63 | </th> |
64 | 64 | <td> |
65 | - <?php echo $reg_detail['value'];?> |
|
65 | + <?php echo $reg_detail['value']; ?> |
|
66 | 66 | </td> |
67 | 67 | </tr> |
68 | 68 | <?php endforeach; // $reg_details?> |
@@ -4,14 +4,14 @@ discard block |
||
4 | 4 | */ |
5 | 5 | ?> |
6 | 6 | <h3> |
7 | - <?php _e( 'Reset/Delete Data for Event Espresso', 'event_espresso' );?> |
|
7 | + <?php _e('Reset/Delete Data for Event Espresso', 'event_espresso'); ?> |
|
8 | 8 | </h3> |
9 | 9 | <br /> |
10 | 10 | |
11 | 11 | <!-- reset DB url is here. Just need to make it look pretty and unhide it--> |
12 | 12 | <div class="padding"> |
13 | - <h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Capabilities', 'event_espresso');?></h4> |
|
14 | - <p><?php _e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities. Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso');?></p> |
|
13 | + <h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Capabilities', 'event_espresso'); ?></h4> |
|
14 | + <p><?php _e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities. Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso'); ?></p> |
|
15 | 15 | <div class="float-right"><?php echo $reset_capabilities_button; ?></div> |
16 | 16 | <div class="clear"></div> |
17 | 17 | </div> |
@@ -19,24 +19,24 @@ discard block |
||
19 | 19 | <br /> |
20 | 20 | |
21 | 21 | <div class="padding"> |
22 | - <h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Tables', 'event_espresso');?></h4> |
|
23 | - <p><?php _e('Use this to reset Event Espresso Data and return your site to how it was just after first activating Event Espresso.', 'event_espresso');?></p> |
|
24 | - <div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url;?>"><?php _e('Reset Event Espresso Tables', 'event_espresso');?></a></div> |
|
22 | + <h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Tables', 'event_espresso'); ?></h4> |
|
23 | + <p><?php _e('Use this to reset Event Espresso Data and return your site to how it was just after first activating Event Espresso.', 'event_espresso'); ?></p> |
|
24 | + <div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url; ?>"><?php _e('Reset Event Espresso Tables', 'event_espresso'); ?></a></div> |
|
25 | 25 | <div class="clear"></div> |
26 | 26 | </div> |
27 | 27 | <br /> |
28 | 28 | <br /> |
29 | 29 | |
30 | 30 | <div class="padding"> |
31 | - <h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php _e('Permanently Delete ALL Event Espresso Tables and Data', 'event_espresso');?></h4> |
|
32 | - <p><?php _e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso');?></p> |
|
33 | - <p class="important-notice"><?php printf( __('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<strong>', '</strong>' ); ?><br/></p> |
|
31 | + <h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php _e('Permanently Delete ALL Event Espresso Tables and Data', 'event_espresso'); ?></h4> |
|
32 | + <p><?php _e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso'); ?></p> |
|
33 | + <p class="important-notice"><?php printf(__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<strong>', '</strong>'); ?><br/></p> |
|
34 | 34 | <ol> |
35 | - <li><?php printf( __('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being migrated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the migration will continue where it left off.', 'event_espresso'), '<strong>', '</strong>' );?></li> |
|
36 | - <li><?php printf( __('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li> |
|
37 | - <li><?php printf( __('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li> |
|
35 | + <li><?php printf(__('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being migrated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the migration will continue where it left off.', 'event_espresso'), '<strong>', '</strong>'); ?></li> |
|
36 | + <li><?php printf(__('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>'); ?></li> |
|
37 | + <li><?php printf(__('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>'); ?></li> |
|
38 | 38 | </ol> |
39 | - <div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php _e('Permanently Delete All Event Espresso Data', 'event_espresso');?></a></div> |
|
39 | + <div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php _e('Permanently Delete All Event Espresso Data', 'event_espresso'); ?></a></div> |
|
40 | 40 | <div class="clear"></div> |
41 | 41 | </div> |
42 | 42 | <br/> |
@@ -1,11 +1,11 @@ discard block |
||
1 | -<p><strong><?php _e( 'Mijireh', 'event_espresso' ); ?></strong></p> |
|
1 | +<p><strong><?php _e('Mijireh', 'event_espresso'); ?></strong></p> |
|
2 | 2 | <p> |
3 | - <?php _e( 'Adjust the settings for the Mijireh payment gateway.', 'event_espresso' ); ?> |
|
3 | + <?php _e('Adjust the settings for the Mijireh payment gateway.', 'event_espresso'); ?> |
|
4 | 4 | </p> |
5 | 5 | <p> |
6 | 6 | <?php |
7 | 7 | printf( |
8 | - __( 'Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %1$sMijireh\' website%2$s, where you configure your Mijireh store with the %3$spayment gateway of your choice%4$s.', 'event_espresso' ), |
|
8 | + __('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %1$sMijireh\' website%2$s, where you configure your Mijireh store with the %3$spayment gateway of your choice%4$s.', 'event_espresso'), |
|
9 | 9 | '<a href="http://www.mijireh.com/" target="_blank">', |
10 | 10 | '</a>', |
11 | 11 | '<a href="http://www.mijireh.com/docs/payment-gateways/" target="_blank">', |
@@ -14,26 +14,26 @@ discard block |
||
14 | 14 | ?> |
15 | 15 | </p> |
16 | 16 | <p> |
17 | - <?php _e( 'For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso' ) ?> |
|
17 | + <?php _e('For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso') ?> |
|
18 | 18 | </p> |
19 | 19 | <ul> |
20 | 20 | <li> |
21 | - <strong><?php _e( 'Mijireh Access Key', 'event_espresso' ); ?></strong><br/> |
|
21 | + <strong><?php _e('Mijireh Access Key', 'event_espresso'); ?></strong><br/> |
|
22 | 22 | <?php |
23 | 23 | printf( |
24 | - __( 'Enter your Access Key for Mijireh. Your Access Key can be found in your %1$sMijireh account dashboard%2$s.', 'event_espresso' ), |
|
24 | + __('Enter your Access Key for Mijireh. Your Access Key can be found in your %1$sMijireh account dashboard%2$s.', 'event_espresso'), |
|
25 | 25 | '<a href="https://secure.mijireh.com/login" target="_blank">', |
26 | 26 | '</a>' |
27 | 27 | ); |
28 | 28 | ?> |
29 | 29 | </li> |
30 | 30 | <li> |
31 | - <strong><?php _e( 'Button Image URL', 'event_espresso' ); ?></strong><br/> |
|
32 | - <?php _e( 'Change the image that is used for this payment gateway.', 'event_espresso' ); ?> |
|
31 | + <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br/> |
|
32 | + <?php _e('Change the image that is used for this payment gateway.', 'event_espresso'); ?> |
|
33 | 33 | </li> |
34 | 34 | </ul> |
35 | -<p><strong><?php _e( 'Mijireh Checkout Page Design', 'event_espresso' ); ?></strong></p> |
|
35 | +<p><strong><?php _e('Mijireh Checkout Page Design', 'event_espresso'); ?></strong></p> |
|
36 | 36 | <p> |
37 | - <?php _e( "As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso' ); ?> |
|
38 | - <?php printf( __( "In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso' ), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>' ); ?> |
|
37 | + <?php _e("As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso'); ?> |
|
38 | + <?php printf(__("In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso'), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>'); ?> |
|
39 | 39 | </p> |
40 | 40 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -36,25 +36,25 @@ discard block |
||
36 | 36 | |
37 | 37 | |
38 | 38 | private function _do_hooks() { |
39 | - add_filter('FHEE_show_sponsors_meta_box', '__return_false', 10 ); |
|
40 | - add_filter('FHEE_show_ratings_request_meta_box', '__return_false', 10 ); |
|
41 | - add_filter('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array( $this, 'forums_lazy_loading'), 10 ); |
|
42 | - add_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content', array( $this, 'extra_news_box_content' ), 10 ); |
|
39 | + add_filter('FHEE_show_sponsors_meta_box', '__return_false', 10); |
|
40 | + add_filter('FHEE_show_ratings_request_meta_box', '__return_false', 10); |
|
41 | + add_filter('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array($this, 'forums_lazy_loading'), 10); |
|
42 | + add_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content', array($this, 'extra_news_box_content'), 10); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
46 | 46 | |
47 | 47 | |
48 | - public function extra_news_box_content( $content ) { |
|
49 | - echo '<h3 style="margin:0">' . __('From the Forums', 'event_espresso') . '</h3>'; |
|
48 | + public function extra_news_box_content($content) { |
|
49 | + echo '<h3 style="margin:0">'.__('From the Forums', 'event_espresso').'</h3>'; |
|
50 | 50 | echo '<div id="ee_forum_posts_content">'; |
51 | 51 | $url = 'http://eventespresso.com/forum/event-espresso-support/feed/'; |
52 | - EE_Admin_Page::cached_rss_display( 'ee_forum_posts_content', $url); |
|
52 | + EE_Admin_Page::cached_rss_display('ee_forum_posts_content', $url); |
|
53 | 53 | echo '</div>'; |
54 | 54 | } |
55 | 55 | |
56 | 56 | |
57 | - public function forums_lazy_loading( $ids ) { |
|
57 | + public function forums_lazy_loading($ids) { |
|
58 | 58 | $ids[] = 'ee_forum_posts_content'; |
59 | 59 | return $ids; |
60 | 60 | } |
@@ -2,18 +2,18 @@ |
||
2 | 2 | <p> |
3 | 3 | <?php _e('The importer can be used to import event information into Event Espresso using a CSV file.', 'event_espresso'); ?> |
4 | 4 | </p> |
5 | -<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso');?></strong></p> |
|
5 | +<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></strong></p> |
|
6 | 6 | <p> |
7 | 7 | <?php _e('To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).', 'event_espresso'); ?> |
8 | 8 | </p> |
9 | 9 | <p> |
10 | 10 | <?php _e('Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.', 'event_espresso'); ?> |
11 | 11 | </p> |
12 | -<p><strong><?php _e("Importing from this Site", 'event_espresso');?></strong></p> |
|
13 | -<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso');?></p> |
|
12 | +<p><strong><?php _e("Importing from this Site", 'event_espresso'); ?></strong></p> |
|
13 | +<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso'); ?></p> |
|
14 | 14 | |
15 | - <p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso");?></strong></p> |
|
16 | - <p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso");?></p> |
|
17 | - <p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso");?></p> |
|
18 | - <p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso");?></p> |
|
19 | - <p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso");?></p> |
|
20 | 15 | \ No newline at end of file |
16 | + <p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></strong></p> |
|
17 | + <p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso"); ?></p> |
|
18 | + <p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso"); ?></p> |
|
19 | + <p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso"); ?></p> |
|
20 | + <p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso"); ?></p> |
|
21 | 21 | \ No newline at end of file |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once( EE_MODELS . 'fields/EE_Integer_Field.php'); |
|
3 | -class EE_Boolean_Field extends EE_Integer_Field{ |
|
2 | +require_once(EE_MODELS.'fields/EE_Integer_Field.php'); |
|
3 | +class EE_Boolean_Field extends EE_Integer_Field { |
|
4 | 4 | function prepare_for_set($value_inputted_for_field_on_model_object) { |
5 | - if ($value_inputted_for_field_on_model_object){ |
|
5 | + if ($value_inputted_for_field_on_model_object) { |
|
6 | 6 | return true; |
7 | - }else{ |
|
7 | + } else { |
|
8 | 8 | return false; |
9 | 9 | } |
10 | 10 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * @return boolean |
15 | 15 | */ |
16 | 16 | function prepare_for_set_from_db($value_inputted_for_field_on_model_object) { |
17 | - return intval( $value_inputted_for_field_on_model_object ) ? true : false; |
|
17 | + return intval($value_inputted_for_field_on_model_object) ? true : false; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -22,10 +22,10 @@ discard block |
||
22 | 22 | * @param boolean $value_on_field_to_be_outputted |
23 | 23 | * @return string Yes or No |
24 | 24 | */ |
25 | - function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ) { |
|
25 | + function prepare_for_pretty_echoing($value_on_field_to_be_outputted) { |
|
26 | 26 | return apply_filters( |
27 | 27 | 'FHEE__EE_Boolean_Field__prepare_for_pretty_echoing__return', |
28 | - $value_on_field_to_be_outputted ? __( 'Yes', 'event_espresso' ) : __( 'No', 'event_espresso' ), |
|
28 | + $value_on_field_to_be_outputted ? __('Yes', 'event_espresso') : __('No', 'event_espresso'), |
|
29 | 29 | $value_on_field_to_be_outputted |
30 | 30 | ); |
31 | 31 | } |
@@ -17,13 +17,13 @@ discard block |
||
17 | 17 | * @since 4.8.30.rc.007 |
18 | 18 | * |
19 | 19 | */ |
20 | -if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
21 | - exit( 'No direct script access allowed' ); |
|
20 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
21 | + exit('No direct script access allowed'); |
|
22 | 22 | } |
23 | 23 | |
24 | -define( 'BATCH_URL', plugin_dir_url( __FILE__ ) ); |
|
24 | +define('BATCH_URL', plugin_dir_url(__FILE__)); |
|
25 | 25 | |
26 | -class EED_Batch extends EED_Module{ |
|
26 | +class EED_Batch extends EED_Module { |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | public static function set_hooks() { |
71 | 71 | //because this is a possibel attack vector, let's have this disabled until |
72 | 72 | //we at least have a real use for it on the frontend |
73 | - if( apply_filters( 'FHEE__EED_Batch__set_hooks__enable_frontend_batch', false ) ) { |
|
74 | - add_action( 'wp_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) ); |
|
75 | - add_filter( 'template_include', array( self::instance(), 'override_template' ), 99 ); |
|
73 | + if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) { |
|
74 | + add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts')); |
|
75 | + add_filter('template_include', array(self::instance(), 'override_template'), 99); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
@@ -80,28 +80,28 @@ discard block |
||
80 | 80 | * Initializes some hooks for the admin in order to run batch jobs |
81 | 81 | */ |
82 | 82 | public static function set_hooks_admin() { |
83 | - add_action( 'admin_menu', array( self::instance(), 'register_admin_pages' ) ); |
|
84 | - add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) ); |
|
83 | + add_action('admin_menu', array(self::instance(), 'register_admin_pages')); |
|
84 | + add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts')); |
|
85 | 85 | |
86 | 86 | //ajax |
87 | - add_action('wp_ajax_espresso_batch_continue',array(self::instance(),'batch_continue')); |
|
88 | - add_action('wp_ajax_espresso_batch_cleanup',array(self::instance(),'batch_cleanup')); |
|
89 | - add_action('wp_ajax_nopriv_espresso_batch_continue',array(self::instance(),'batch_continue')); |
|
90 | - add_action('wp_ajax_nopriv_espresso_batch_cleanup',array(self::instance(),'batch_cleanup')); |
|
87 | + add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue')); |
|
88 | + add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup')); |
|
89 | + add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue')); |
|
90 | + add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup')); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | 94 | * Enqueues batch scripts on the frontend or admin, and creates a job |
95 | 95 | */ |
96 | 96 | public function enqueue_scripts() { |
97 | - if( isset( $_REQUEST[ 'espresso_batch' ] ) |
|
97 | + if (isset($_REQUEST['espresso_batch']) |
|
98 | 98 | || |
99 | 99 | ( |
100 | - isset( $_REQUEST[ 'page' ] ) |
|
101 | - && $_REQUEST[ 'page' ] == 'espresso_batch' |
|
100 | + isset($_REQUEST['page']) |
|
101 | + && $_REQUEST['page'] == 'espresso_batch' |
|
102 | 102 | ) |
103 | 103 | ) { |
104 | - switch( $this->batch_request_type() ) { |
|
104 | + switch ($this->batch_request_type()) { |
|
105 | 105 | case self::batch_job: |
106 | 106 | $this->enqueue_scripts_styles_batch_create(); |
107 | 107 | break; |
@@ -117,11 +117,11 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function enqueue_scripts_styles_batch_create() { |
119 | 119 | $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job(); |
120 | - wp_enqueue_script( 'batch_runner_init', BATCH_URL . '/assets/batch_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true ); |
|
121 | - wp_localize_script( 'batch_runner_init', 'ee_job_response', $job_response->to_array() ); |
|
122 | - wp_localize_script( 'batch_runner_init', 'ee_job_i18n', |
|
120 | + wp_enqueue_script('batch_runner_init', BATCH_URL.'/assets/batch_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true); |
|
121 | + wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array()); |
|
122 | + wp_localize_script('batch_runner_init', 'ee_job_i18n', |
|
123 | 123 | array( |
124 | - 'return_url' => $_REQUEST['return_url' ], |
|
124 | + 'return_url' => $_REQUEST['return_url'], |
|
125 | 125 | )); |
126 | 126 | } |
127 | 127 | |
@@ -131,15 +131,15 @@ discard block |
||
131 | 131 | public function enqueue_scripts_styles_batch_file_create() { |
132 | 132 | //creates a job based on the request variable |
133 | 133 | $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job(); |
134 | - wp_enqueue_script( 'batch_file_runner_init', BATCH_URL . '/assets/batch_file_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true ); |
|
135 | - wp_localize_script( 'batch_file_runner_init', 'ee_job_response', $job_response->to_array() ); |
|
136 | - wp_localize_script( 'batch_file_runner_init', 'ee_job_i18n', |
|
134 | + wp_enqueue_script('batch_file_runner_init', BATCH_URL.'/assets/batch_file_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true); |
|
135 | + wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array()); |
|
136 | + wp_localize_script('batch_file_runner_init', 'ee_job_i18n', |
|
137 | 137 | array( |
138 | 138 | 'download_and_redirecting' => sprintf( |
139 | 139 | __('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'), |
140 | - '<a href="' . $_REQUEST['return_url' ] .'">', |
|
140 | + '<a href="'.$_REQUEST['return_url'].'">', |
|
141 | 141 | '</a>' ), |
142 | - 'return_url' => $_REQUEST['return_url' ], |
|
142 | + 'return_url' => $_REQUEST['return_url'], |
|
143 | 143 | )); |
144 | 144 | } |
145 | 145 | |
@@ -150,18 +150,18 @@ discard block |
||
150 | 150 | * @return \EventEspressoBatchRequest\Helpers\JobStepResponse |
151 | 151 | */ |
152 | 152 | protected function _enqueue_batch_job_scripts_and_styles_and_start_job() { |
153 | - wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) ); |
|
154 | - wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION ); |
|
155 | - wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' )); |
|
153 | + wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery')); |
|
154 | + wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION); |
|
155 | + wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar')); |
|
156 | 156 | //just copy the bits of EE admin's eei18n that we need in the JS |
157 | - wp_localize_script( 'batch_runner', 'eei18n', array( 'ajax_url' => WP_AJAX_URL, 'is_admin' => (bool)is_admin() ) ); |
|
158 | - $job_handler_classname = stripslashes( $_GET[ 'job_handler' ] ); |
|
157 | + wp_localize_script('batch_runner', 'eei18n', array('ajax_url' => WP_AJAX_URL, 'is_admin' => (bool) is_admin())); |
|
158 | + $job_handler_classname = stripslashes($_GET['job_handler']); |
|
159 | 159 | $request_data = array_diff_key( |
160 | 160 | $_REQUEST, |
161 | - array_flip( array( 'action', 'page', 'ee', 'batch' ) ) ); |
|
161 | + array_flip(array('action', 'page', 'ee', 'batch')) ); |
|
162 | 162 | $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor(); |
163 | 163 | //eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' |
164 | - $job_response = $batch_runner->create_job( $job_handler_classname, $request_data ); |
|
164 | + $job_response = $batch_runner->create_job($job_handler_classname, $request_data); |
|
165 | 165 | //remember the response for later. We need it to display the page body |
166 | 166 | $this->_job_step_response = $job_response; |
167 | 167 | return $job_response; |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | * @param string $template |
173 | 173 | * @return string |
174 | 174 | */ |
175 | - public function override_template( $template ) { |
|
176 | - if( isset( $_REQUEST[ 'espresso_batch' ] ) && isset( $_REQUEST[ 'batch' ] ) ) { |
|
177 | - return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html'; |
|
175 | + public function override_template($template) { |
|
176 | + if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) { |
|
177 | + return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html'; |
|
178 | 178 | } |
179 | 179 | return $template; |
180 | 180 | } |
@@ -185,11 +185,11 @@ discard block |
||
185 | 185 | public function register_admin_pages() { |
186 | 186 | add_submenu_page( |
187 | 187 | '', //parent slug. we don't want this to actually appear in the menu |
188 | - __( 'Batch Job', 'event_espresso' ), //page title |
|
188 | + __('Batch Job', 'event_espresso'), //page title |
|
189 | 189 | 'n/a', //menu title |
190 | 190 | 'read', //we want this page to actually be accessible to anyone, |
191 | 191 | 'espresso_batch', //menu slug |
192 | - array( self::instance(), 'show_admin_page' ) |
|
192 | + array(self::instance(), 'show_admin_page') |
|
193 | 193 | ); |
194 | 194 | } |
195 | 195 | |
@@ -199,8 +199,8 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function show_admin_page() { |
201 | 201 | echo EEH_Template::locate_template( |
202 | - EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html', |
|
203 | - array( 'batch_request_type' => $this->batch_request_type() ) |
|
202 | + EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html', |
|
203 | + array('batch_request_type' => $this->batch_request_type()) |
|
204 | 204 | ); |
205 | 205 | } |
206 | 206 | |
@@ -208,10 +208,10 @@ discard block |
||
208 | 208 | * Receives ajax calls for continuing a job |
209 | 209 | */ |
210 | 210 | public function batch_continue() { |
211 | - $job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] ); |
|
211 | + $job_id = sanitize_text_field($_REQUEST['job_id']); |
|
212 | 212 | $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor(); |
213 | - $response_obj = $batch_runner->continue_job( $job_id); |
|
214 | - $this->_return_json( $response_obj->to_array() ); |
|
213 | + $response_obj = $batch_runner->continue_job($job_id); |
|
214 | + $this->_return_json($response_obj->to_array()); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
@@ -219,10 +219,10 @@ discard block |
||
219 | 219 | * @return type |
220 | 220 | */ |
221 | 221 | public function batch_cleanup() { |
222 | - $job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] ); |
|
222 | + $job_id = sanitize_text_field($_REQUEST['job_id']); |
|
223 | 223 | $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor(); |
224 | - $response_obj = $batch_runner->cleanup_job( $job_id ); |
|
225 | - $this->_return_json( $response_obj->to_array() ); |
|
224 | + $response_obj = $batch_runner->cleanup_job($job_id); |
|
225 | + $this->_return_json($response_obj->to_array()); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * 'isEEajax' => true,//indicates this is a response from EE |
239 | 239 | * ) |
240 | 240 | */ |
241 | - protected function _return_json( $data ) { |
|
241 | + protected function _return_json($data) { |
|
242 | 242 | $json = array( |
243 | 243 | 'notices' => EE_Error::get_notices(), |
244 | 244 | 'data' => $data, |
@@ -247,13 +247,13 @@ discard block |
||
247 | 247 | |
248 | 248 | |
249 | 249 | // make sure there are no php errors or headers_sent. Then we can set correct json header. |
250 | - if ( NULL === error_get_last() || ! headers_sent() ) { |
|
250 | + if (NULL === error_get_last() || ! headers_sent()) { |
|
251 | 251 | header('Content-Type: application/json; charset=UTF-8'); |
252 | 252 | } |
253 | - if( function_exists( 'wp_json_encode' ) ) { |
|
254 | - echo wp_json_encode( $json ); |
|
253 | + if (function_exists('wp_json_encode')) { |
|
254 | + echo wp_json_encode($json); |
|
255 | 255 | } else { |
256 | - echo json_encode( $json ); |
|
256 | + echo json_encode($json); |
|
257 | 257 | } |
258 | 258 | exit(); |
259 | 259 | } |
@@ -270,16 +270,16 @@ discard block |
||
270 | 270 | * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job |
271 | 271 | */ |
272 | 272 | public function batch_request_type() { |
273 | - if( $this->_batch_request_type === null ) { |
|
274 | - if( isset( $_GET[ 'batch' ] ) ) { |
|
275 | - if( $_GET[ 'batch' ] == self::batch_job ) { |
|
273 | + if ($this->_batch_request_type === null) { |
|
274 | + if (isset($_GET['batch'])) { |
|
275 | + if ($_GET['batch'] == self::batch_job) { |
|
276 | 276 | $this->_batch_request_type = self::batch_job; |
277 | - } elseif( $_GET[ 'batch' ] == self::batch_file_job ) { |
|
277 | + } elseif ($_GET['batch'] == self::batch_file_job) { |
|
278 | 278 | $this->_batch_request_type = self::batch_file_job; |
279 | 279 | } |
280 | 280 | } |
281 | 281 | //if we didn't find that it was a batch request, indicate it wasn't |
282 | - if( $this->_batch_request_type === null ) { |
|
282 | + if ($this->_batch_request_type === null) { |
|
283 | 283 | $this->_batch_request_type = self::batch_not_job; |
284 | 284 | } |
285 | 285 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | * Unnecessary |
291 | 291 | * @param type $WP |
292 | 292 | */ |
293 | - public function run( $WP ) { |
|
293 | + public function run($WP) { |
|
294 | 294 | |
295 | 295 | } |
296 | 296 |
@@ -1,26 +1,26 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | /** |
3 | - * Event Espresso |
|
4 | - * |
|
5 | - * Event Registration and Management Plugin for WordPress |
|
6 | - * |
|
7 | - * @ package Event Espresso |
|
8 | - * @ author Seth Shoultes |
|
9 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | - * @ license {@link http://eventespresso.com/support/terms-conditions/} * see Plugin Licensing * |
|
11 | - * @ link {@link http://www.eventespresso.com} |
|
12 | - * @ since 4.0 |
|
13 | - * |
|
14 | - * ------------------------------------------------------------------------ |
|
15 | - * |
|
16 | - * EE_Admin_Transactions class |
|
17 | - * |
|
18 | - * @package Event Espresso |
|
19 | - * @subpackage includes/core/admin/transactions/Transactions_Admin_Page.core.php |
|
20 | - * @author Brent Christensen |
|
21 | - * |
|
22 | - * ------------------------------------------------------------------------ |
|
23 | - */ |
|
3 | + * Event Espresso |
|
4 | + * |
|
5 | + * Event Registration and Management Plugin for WordPress |
|
6 | + * |
|
7 | + * @ package Event Espresso |
|
8 | + * @ author Seth Shoultes |
|
9 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | + * @ license {@link http://eventespresso.com/support/terms-conditions/} * see Plugin Licensing * |
|
11 | + * @ link {@link http://www.eventespresso.com} |
|
12 | + * @ since 4.0 |
|
13 | + * |
|
14 | + * ------------------------------------------------------------------------ |
|
15 | + * |
|
16 | + * EE_Admin_Transactions class |
|
17 | + * |
|
18 | + * @package Event Espresso |
|
19 | + * @subpackage includes/core/admin/transactions/Transactions_Admin_Page.core.php |
|
20 | + * @author Brent Christensen |
|
21 | + * |
|
22 | + * ------------------------------------------------------------------------ |
|
23 | + */ |
|
24 | 24 | class Transactions_Admin_Page extends EE_Admin_Page { |
25 | 25 | |
26 | 26 | /** |
@@ -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(); |
@@ -247,10 +247,10 @@ discard block |
||
247 | 247 | /** |
248 | 248 | * _set_transaction_status_array |
249 | 249 | * sets list of transaction statuses |
250 | - * |
|
250 | + * |
|
251 | 251 | * @access private |
252 | - * @return void |
|
253 | - */ |
|
252 | + * @return void |
|
253 | + */ |
|
254 | 254 | private function _set_transaction_status_array() { |
255 | 255 | self::$_txn_status = EEM_Transaction::instance()->status_array(TRUE); |
256 | 256 | } |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | |
273 | 273 | /** |
274 | 274 | * get list of payment statuses |
275 | - * |
|
275 | + * |
|
276 | 276 | * @access private |
277 | - * @return void |
|
278 | - */ |
|
277 | + * @return void |
|
278 | + */ |
|
279 | 279 | private function _get_payment_status_array() { |
280 | 280 | self::$_pay_status = EEM_Payment::instance()->status_array(TRUE); |
281 | 281 | $this->_template_args['payment_status'] = self::$_pay_status; |
@@ -383,18 +383,18 @@ discard block |
||
383 | 383 | if ( is_object( $this->_transaction) ) |
384 | 384 | return; //get out we've already set the object |
385 | 385 | |
386 | - $TXN = EEM_Transaction::instance(); |
|
386 | + $TXN = EEM_Transaction::instance(); |
|
387 | 387 | |
388 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
388 | + $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
389 | 389 | |
390 | - //get transaction object |
|
391 | - $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
|
392 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
390 | + //get transaction object |
|
391 | + $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
|
392 | + $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
393 | 393 | |
394 | 394 | if ( empty( $this->_transaction ) ) { |
395 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
395 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
396 | 396 | EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
397 | - } |
|
397 | + } |
|
398 | 398 | } |
399 | 399 | |
400 | 400 | |
@@ -496,12 +496,12 @@ discard block |
||
496 | 496 | |
497 | 497 | |
498 | 498 | /** |
499 | - * _transaction_details |
|
499 | + * _transaction_details |
|
500 | 500 | * generates HTML for the View Transaction Details Admin page |
501 | - * |
|
501 | + * |
|
502 | 502 | * @access protected |
503 | - * @return void |
|
504 | - */ |
|
503 | + * @return void |
|
504 | + */ |
|
505 | 505 | protected function _transaction_details() { |
506 | 506 | do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
507 | 507 | EE_Registry::instance()->load_helper( 'MSG_Template' ); |
@@ -624,10 +624,10 @@ discard block |
||
624 | 624 | /** |
625 | 625 | * txn_details_meta_box |
626 | 626 | * generates HTML for the Transaction main meta box |
627 | - * |
|
627 | + * |
|
628 | 628 | * @access public |
629 | - * @return void |
|
630 | - */ |
|
629 | + * @return void |
|
630 | + */ |
|
631 | 631 | public function txn_details_meta_box() { |
632 | 632 | |
633 | 633 | $this->_set_transaction_object(); |
@@ -968,10 +968,10 @@ discard block |
||
968 | 968 | /** |
969 | 969 | * txn_billing_info_side_meta_box |
970 | 970 | * generates HTML for the Edit Transaction side meta box |
971 | - * |
|
971 | + * |
|
972 | 972 | * @access public |
973 | - * @return void |
|
974 | - */ |
|
973 | + * @return void |
|
974 | + */ |
|
975 | 975 | public function txn_billing_info_side_meta_box() { |
976 | 976 | |
977 | 977 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
@@ -989,10 +989,10 @@ discard block |
||
989 | 989 | /** |
990 | 990 | * apply_payments_or_refunds |
991 | 991 | * registers a payment or refund made towards a transaction |
992 | - * |
|
992 | + * |
|
993 | 993 | * @access public |
994 | - * @return void |
|
995 | - */ |
|
994 | + * @return void |
|
995 | + */ |
|
996 | 996 | public function apply_payments_or_refunds() { |
997 | 997 | $json_response_data = array( 'return_data' => FALSE ); |
998 | 998 | $valid_data = $this->_validate_payment_request_data(); |
@@ -1140,9 +1140,9 @@ discard block |
||
1140 | 1140 | 'default' => '', |
1141 | 1141 | 'required' => false, |
1142 | 1142 | 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
1143 | - 'validation_strategies' => array( |
|
1144 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1145 | - ) |
|
1143 | + 'validation_strategies' => array( |
|
1144 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1145 | + ) |
|
1146 | 1146 | ) |
1147 | 1147 | ), |
1148 | 1148 | 'po_number' => new EE_Text_Input( |
@@ -1150,9 +1150,9 @@ discard block |
||
1150 | 1150 | 'default' => '', |
1151 | 1151 | 'required' => false, |
1152 | 1152 | 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
1153 | - 'validation_strategies' => array( |
|
1154 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1155 | - ) |
|
1153 | + 'validation_strategies' => array( |
|
1154 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1155 | + ) |
|
1156 | 1156 | ) |
1157 | 1157 | ), |
1158 | 1158 | 'accounting' => new EE_Text_Input( |
@@ -1160,9 +1160,9 @@ discard block |
||
1160 | 1160 | 'default' => '', |
1161 | 1161 | 'required' => false, |
1162 | 1162 | 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
1163 | - 'validation_strategies' => array( |
|
1164 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1165 | - ) |
|
1163 | + 'validation_strategies' => array( |
|
1164 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1165 | + ) |
|
1166 | 1166 | ) |
1167 | 1167 | ), |
1168 | 1168 | ) |
@@ -1454,10 +1454,10 @@ discard block |
||
1454 | 1454 | /** |
1455 | 1455 | * delete_payment |
1456 | 1456 | * delete a payment or refund made towards a transaction |
1457 | - * |
|
1457 | + * |
|
1458 | 1458 | * @access public |
1459 | - * @return void |
|
1460 | - */ |
|
1459 | + * @return void |
|
1460 | + */ |
|
1461 | 1461 | public function delete_payment() { |
1462 | 1462 | $json_response_data = array( 'return_data' => FALSE ); |
1463 | 1463 | $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; |
@@ -1572,12 +1572,12 @@ discard block |
||
1572 | 1572 | /** |
1573 | 1573 | * _send_payment_reminder |
1574 | 1574 | * generates HTML for the View Transaction Details Admin page |
1575 | - * |
|
1575 | + * |
|
1576 | 1576 | * @access protected |
1577 | - * @return void |
|
1578 | - */ |
|
1577 | + * @return void |
|
1578 | + */ |
|
1579 | 1579 | protected function _send_payment_reminder() { |
1580 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1580 | + $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1581 | 1581 | $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
1582 | 1582 | $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
1583 | 1583 | do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
@@ -1599,29 +1599,29 @@ discard block |
||
1599 | 1599 | |
1600 | 1600 | $TXN = EEM_Transaction::instance(); |
1601 | 1601 | |
1602 | - $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' )); |
|
1603 | - $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' ); |
|
1602 | + $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' )); |
|
1603 | + $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' ); |
|
1604 | 1604 | |
1605 | - //make sure our timestamps start and end right at the boundaries for each day |
|
1606 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1607 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1605 | + //make sure our timestamps start and end right at the boundaries for each day |
|
1606 | + $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1607 | + $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1608 | 1608 | |
1609 | 1609 | |
1610 | - //convert to timestamps |
|
1611 | - $start_date = strtotime( $start_date ); |
|
1612 | - $end_date = strtotime( $end_date ); |
|
1610 | + //convert to timestamps |
|
1611 | + $start_date = strtotime( $start_date ); |
|
1612 | + $end_date = strtotime( $end_date ); |
|
1613 | 1613 | |
1614 | - //makes sure start date is the lowest value and vice versa |
|
1615 | - $start_date = min( $start_date, $end_date ); |
|
1616 | - $end_date = max( $start_date, $end_date ); |
|
1614 | + //makes sure start date is the lowest value and vice versa |
|
1615 | + $start_date = min( $start_date, $end_date ); |
|
1616 | + $end_date = max( $start_date, $end_date ); |
|
1617 | 1617 | |
1618 | - //convert to correct format for query |
|
1618 | + //convert to correct format for query |
|
1619 | 1619 | $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' ); |
1620 | 1620 | $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' ); |
1621 | 1621 | |
1622 | 1622 | |
1623 | 1623 | |
1624 | - //set orderby |
|
1624 | + //set orderby |
|
1625 | 1625 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1626 | 1626 | |
1627 | 1627 | switch ( $this->_req_data['orderby'] ) { |
@@ -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 ) { |
@@ -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 |
@@ -234,10 +234,10 @@ discard block |
||
234 | 234 | protected function _add_screen_options() {} |
235 | 235 | protected function _add_feature_pointers() {} |
236 | 236 | public function admin_init() { |
237 | - 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' ); |
|
238 | - EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' ); |
|
239 | - EE_Registry::$i18n_js_strings[ 'txn_status_array' ] = self::$_txn_status; |
|
240 | - EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status; |
|
237 | + 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'); |
|
238 | + EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso'); |
|
239 | + EE_Registry::$i18n_js_strings['txn_status_array'] = self::$_txn_status; |
|
240 | + EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status; |
|
241 | 241 | } |
242 | 242 | public function admin_notices() {} |
243 | 243 | public function admin_footer_scripts() {} |
@@ -304,14 +304,14 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function load_scripts_styles() { |
306 | 306 | //enqueue style |
307 | - wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION ); |
|
307 | + wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION); |
|
308 | 308 | wp_enqueue_style('espresso_txn'); |
309 | 309 | |
310 | 310 | //scripts |
311 | 311 | add_filter('FHEE_load_accounting_js', '__return_true'); |
312 | 312 | |
313 | 313 | //scripts |
314 | - 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); |
|
314 | + 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); |
|
315 | 315 | wp_enqueue_script('espresso_txn'); |
316 | 316 | |
317 | 317 | } |
@@ -351,8 +351,8 @@ discard block |
||
351 | 351 | * @return void |
352 | 352 | */ |
353 | 353 | protected function _set_list_table_views_default() { |
354 | - $this->_views = array ( |
|
355 | - 'all' => array ( |
|
354 | + $this->_views = array( |
|
355 | + 'all' => array( |
|
356 | 356 | 'slug' => 'all', |
357 | 357 | 'label' => __('View All Transactions', 'event_espresso'), |
358 | 358 | 'count' => 0 |
@@ -380,20 +380,20 @@ discard block |
||
380 | 380 | * @return void |
381 | 381 | */ |
382 | 382 | private function _set_transaction_object() { |
383 | - if ( is_object( $this->_transaction) ) |
|
383 | + if (is_object($this->_transaction)) |
|
384 | 384 | return; //get out we've already set the object |
385 | 385 | |
386 | 386 | $TXN = EEM_Transaction::instance(); |
387 | 387 | |
388 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
388 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
389 | 389 | |
390 | 390 | //get transaction object |
391 | 391 | $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
392 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
392 | + $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
393 | 393 | |
394 | - if ( empty( $this->_transaction ) ) { |
|
395 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
396 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
394 | + if (empty($this->_transaction)) { |
|
395 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.__(' could not be retrieved.', 'event_espresso'); |
|
396 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
397 | 397 | } |
398 | 398 | } |
399 | 399 | |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | ), |
420 | 420 | 'view_receipt' => array( |
421 | 421 | 'class' => 'dashicons dashicons-media-default', |
422 | - 'desc' => __('View Transaction Receipt', 'event_espresso' ) |
|
422 | + 'desc' => __('View Transaction Receipt', 'event_espresso') |
|
423 | 423 | ), |
424 | 424 | 'view_registration' => array( |
425 | 425 | 'class' => 'dashicons dashicons-clipboard', |
@@ -428,10 +428,10 @@ discard block |
||
428 | 428 | ) |
429 | 429 | ); |
430 | 430 | |
431 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) { |
|
431 | + if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) { |
|
432 | 432 | |
433 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
434 | - if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) { |
|
433 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
434 | + if (EEH_MSG_Template::is_mt_active('payment_reminder')) { |
|
435 | 435 | $items['send_payment_reminder'] = array( |
436 | 436 | 'class' => 'dashicons dashicons-email-alt', |
437 | 437 | 'desc' => __('Send Payment Reminder', 'event_espresso') |
@@ -452,29 +452,29 @@ discard block |
||
452 | 452 | 'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items', |
453 | 453 | array( |
454 | 454 | 'overpaid' => array( |
455 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code, |
|
456 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' ) |
|
455 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code, |
|
456 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence') |
|
457 | 457 | ), |
458 | 458 | 'complete' => array( |
459 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code, |
|
460 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' ) |
|
459 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code, |
|
460 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence') |
|
461 | 461 | ), |
462 | 462 | 'incomplete' => array( |
463 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code, |
|
464 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' ) |
|
463 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code, |
|
464 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence') |
|
465 | 465 | ), |
466 | 466 | 'abandoned' => array( |
467 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code, |
|
468 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' ) |
|
467 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code, |
|
468 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence') |
|
469 | 469 | ), |
470 | 470 | 'failed' => array( |
471 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code, |
|
472 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' ) |
|
471 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code, |
|
472 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence') |
|
473 | 473 | ) |
474 | 474 | ) |
475 | 475 | ); |
476 | 476 | |
477 | - return array_merge( $items, $more_items); |
|
477 | + return array_merge($items, $more_items); |
|
478 | 478 | } |
479 | 479 | |
480 | 480 | |
@@ -487,9 +487,9 @@ discard block |
||
487 | 487 | */ |
488 | 488 | protected function _transactions_overview_list_table() { |
489 | 489 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
490 | - $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL; |
|
491 | - $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>' ) : ''; |
|
492 | - $this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() ); |
|
490 | + $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL; |
|
491 | + $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>') : ''; |
|
492 | + $this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items()); |
|
493 | 493 | $this->display_admin_list_table_page_with_no_sidebar(); |
494 | 494 | } |
495 | 495 | |
@@ -503,8 +503,8 @@ discard block |
||
503 | 503 | * @return void |
504 | 504 | */ |
505 | 505 | protected function _transaction_details() { |
506 | - do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
|
507 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
506 | + do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction); |
|
507 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
508 | 508 | |
509 | 509 | $this->_set_transaction_status_array(); |
510 | 510 | |
@@ -517,75 +517,75 @@ discard block |
||
517 | 517 | $attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL; |
518 | 518 | |
519 | 519 | $this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID(); |
520 | - $this->_template_args['txn_nmbr']['label'] = __( 'Transaction Number', 'event_espresso' ); |
|
520 | + $this->_template_args['txn_nmbr']['label'] = __('Transaction Number', 'event_espresso'); |
|
521 | 521 | |
522 | - $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a' ); |
|
523 | - $this->_template_args['txn_datetime']['label'] = __( 'Date', 'event_espresso' ); |
|
522 | + $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a'); |
|
523 | + $this->_template_args['txn_datetime']['label'] = __('Date', 'event_espresso'); |
|
524 | 524 | |
525 | - $this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ]; |
|
526 | - $this->_template_args['txn_status']['label'] = __( 'Transaction Status', 'event_espresso' ); |
|
527 | - $this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID'); |
|
525 | + $this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')]; |
|
526 | + $this->_template_args['txn_status']['label'] = __('Transaction Status', 'event_espresso'); |
|
527 | + $this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID'); |
|
528 | 528 | |
529 | 529 | $this->_template_args['grand_total'] = $this->_transaction->get('TXN_total'); |
530 | 530 | $this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid'); |
531 | 531 | |
532 | - if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) { |
|
533 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
534 | - $this->_template_args['send_payment_reminder_button'] = EEH_MSG_Template::is_mt_active( 'payment_reminder' ) |
|
532 | + if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) { |
|
533 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
534 | + $this->_template_args['send_payment_reminder_button'] = EEH_MSG_Template::is_mt_active('payment_reminder') |
|
535 | 535 | && $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code |
536 | 536 | && $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code |
537 | - ? EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$this->_transaction->ID(), 'redirect_to' => 'view_transaction' ), TXN_ADMIN_URL ), __(' Send Payment Reminder'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) |
|
537 | + ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$this->_transaction->ID(), 'redirect_to' => 'view_transaction'), TXN_ADMIN_URL), __(' Send Payment Reminder'), 'button secondary-button right', 'dashicons dashicons-email-alt') |
|
538 | 538 | : ''; |
539 | 539 | } else { |
540 | 540 | $this->_template_args['send_payment_reminder_button'] = ''; |
541 | 541 | } |
542 | 542 | |
543 | 543 | $amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid'); |
544 | - $this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE ); |
|
545 | - if ( EE_Registry::instance()->CFG->currency->sign_b4 ) { |
|
546 | - $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due']; |
|
544 | + $this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE); |
|
545 | + if (EE_Registry::instance()->CFG->currency->sign_b4) { |
|
546 | + $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due']; |
|
547 | 547 | } else { |
548 | - $this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign; |
|
548 | + $this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign; |
|
549 | 549 | } |
550 | - $this->_template_args['amount_due_class'] = ''; |
|
550 | + $this->_template_args['amount_due_class'] = ''; |
|
551 | 551 | |
552 | - if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) { |
|
552 | + if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) { |
|
553 | 553 | // paid in full |
554 | - $this->_template_args['amount_due'] = FALSE; |
|
555 | - } elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) { |
|
554 | + $this->_template_args['amount_due'] = FALSE; |
|
555 | + } elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) { |
|
556 | 556 | // overpaid |
557 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
558 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) { |
|
557 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
558 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) { |
|
559 | 559 | // monies owing |
560 | - $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
561 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) { |
|
560 | + $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
561 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) { |
|
562 | 562 | // no payments made yet |
563 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
564 | - } elseif ( $this->_transaction->get('TXN_total') == 0 ) { |
|
563 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
564 | + } elseif ($this->_transaction->get('TXN_total') == 0) { |
|
565 | 565 | // free event |
566 | - $this->_template_args['amount_due'] = FALSE; |
|
566 | + $this->_template_args['amount_due'] = FALSE; |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | $payment_method = $this->_transaction->payment_method(); |
570 | 570 | |
571 | - $this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' ); |
|
571 | + $this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso'); |
|
572 | 572 | $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign; |
573 | 573 | // link back to overview |
574 | - $this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : TXN_ADMIN_URL; |
|
574 | + $this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : TXN_ADMIN_URL; |
|
575 | 575 | |
576 | 576 | |
577 | 577 | //next and previous links |
578 | - $next_txn = $this->_transaction->next(null, array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), 'TXN_ID' ); |
|
579 | - $this->_template_args['next_transaction'] = $next_txn ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ), TXN_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : ''; |
|
580 | - $previous_txn = $this->_transaction->previous( null, array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), 'TXN_ID' ); |
|
581 | - $this->_template_args['previous_transaction'] = $previous_txn ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ), TXN_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : ''; |
|
578 | + $next_txn = $this->_transaction->next(null, array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), 'TXN_ID'); |
|
579 | + $this->_template_args['next_transaction'] = $next_txn ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']), TXN_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : ''; |
|
580 | + $previous_txn = $this->_transaction->previous(null, array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), 'TXN_ID'); |
|
581 | + $this->_template_args['previous_transaction'] = $previous_txn ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']), TXN_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : ''; |
|
582 | 582 | |
583 | 583 | |
584 | 584 | // grab messages at the last second |
585 | 585 | $this->_template_args['notices'] = EE_Error::get_notices(); |
586 | 586 | // path to template |
587 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php'; |
|
588 | - $this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
587 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php'; |
|
588 | + $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
589 | 589 | |
590 | 590 | // the details template wrapper |
591 | 591 | $this->display_admin_page_with_sidebar(); |
@@ -604,18 +604,18 @@ discard block |
||
604 | 604 | |
605 | 605 | $this->_set_transaction_object(); |
606 | 606 | |
607 | - add_meta_box( 'edit-txn-details-mbox', __( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' ); |
|
607 | + add_meta_box('edit-txn-details-mbox', __('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high'); |
|
608 | 608 | add_meta_box( |
609 | 609 | 'edit-txn-attendees-mbox', |
610 | - __( 'Attendees Registered in this Transaction', 'event_espresso' ), |
|
611 | - array( $this, 'txn_attendees_meta_box' ), |
|
610 | + __('Attendees Registered in this Transaction', 'event_espresso'), |
|
611 | + array($this, 'txn_attendees_meta_box'), |
|
612 | 612 | $this->_wp_page_slug, |
613 | 613 | 'normal', |
614 | 614 | 'high', |
615 | - array( 'TXN_ID' => $this->_transaction->ID() ) |
|
615 | + array('TXN_ID' => $this->_transaction->ID()) |
|
616 | 616 | ); |
617 | - add_meta_box( 'edit-txn-registrant-mbox', __( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
618 | - 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' ); |
|
617 | + add_meta_box('edit-txn-registrant-mbox', __('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
618 | + 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'); |
|
619 | 619 | |
620 | 620 | } |
621 | 621 | |
@@ -636,15 +636,15 @@ discard block |
||
636 | 636 | |
637 | 637 | //get line table |
638 | 638 | EEH_Autoloader::register_line_item_display_autoloaders(); |
639 | - $Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' ); |
|
640 | - $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() ); |
|
639 | + $Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy'); |
|
640 | + $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item()); |
|
641 | 641 | $this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code'); |
642 | 642 | |
643 | 643 | // process taxes |
644 | - $taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax ))); |
|
645 | - $this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE; |
|
644 | + $taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax))); |
|
645 | + $this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE; |
|
646 | 646 | |
647 | - $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE ); |
|
647 | + $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE); |
|
648 | 648 | $this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total'); |
649 | 649 | $this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID'); |
650 | 650 | |
@@ -652,63 +652,63 @@ discard block |
||
652 | 652 | |
653 | 653 | // process payment details |
654 | 654 | $payments = $this->_transaction->get_many_related('Payment'); |
655 | - if( ! empty( $payments ) ) { |
|
656 | - $this->_template_args[ 'payments' ] = $payments; |
|
657 | - $this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments ); |
|
655 | + if ( ! empty($payments)) { |
|
656 | + $this->_template_args['payments'] = $payments; |
|
657 | + $this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments); |
|
658 | 658 | } else { |
659 | - $this->_template_args[ 'payments' ] = false; |
|
660 | - $this->_template_args[ 'existing_reg_payments' ] = array(); |
|
659 | + $this->_template_args['payments'] = false; |
|
660 | + $this->_template_args['existing_reg_payments'] = array(); |
|
661 | 661 | } |
662 | 662 | |
663 | - $this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment' ), TXN_ADMIN_URL ); |
|
664 | - $this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL ); |
|
663 | + $this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL); |
|
664 | + $this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL); |
|
665 | 665 | |
666 | - if ( isset( $txn_details['invoice_number'] )) { |
|
666 | + if (isset($txn_details['invoice_number'])) { |
|
667 | 667 | $this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code']; |
668 | - $this->_template_args['txn_details']['invoice_number']['label'] = __( 'Invoice Number', 'event_espresso' ); |
|
668 | + $this->_template_args['txn_details']['invoice_number']['label'] = __('Invoice Number', 'event_espresso'); |
|
669 | 669 | } |
670 | 670 | |
671 | 671 | $this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session'); |
672 | - $this->_template_args['txn_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' ); |
|
672 | + $this->_template_args['txn_details']['registration_session']['label'] = __('Registration Session', 'event_espresso'); |
|
673 | 673 | |
674 | - $this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : ''; |
|
675 | - $this->_template_args['txn_details']['ip_address']['label'] = __( 'Transaction placed from IP', 'event_espresso' ); |
|
674 | + $this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : ''; |
|
675 | + $this->_template_args['txn_details']['ip_address']['label'] = __('Transaction placed from IP', 'event_espresso'); |
|
676 | 676 | |
677 | - $this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : ''; |
|
678 | - $this->_template_args['txn_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' ); |
|
677 | + $this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : ''; |
|
678 | + $this->_template_args['txn_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso'); |
|
679 | 679 | |
680 | 680 | $reg_steps = '<ul>'; |
681 | - foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) { |
|
682 | - if ( $reg_step_status === true ) { |
|
683 | - $reg_steps .= '<li style="color:#70cc50">' . sprintf( __( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
684 | - } else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) { |
|
685 | - $reg_steps .= '<li style="color:#2EA2CC">' . sprintf( |
|
686 | - __( '%1$s : Initiated %2$s', 'event_espresso' ), |
|
687 | - ucwords( str_replace( '_', ' ', $reg_step ) ), |
|
688 | - gmdate( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) ) |
|
689 | - ) . '</li>'; |
|
681 | + foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) { |
|
682 | + if ($reg_step_status === true) { |
|
683 | + $reg_steps .= '<li style="color:#70cc50">'.sprintf(__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
684 | + } else if (is_numeric($reg_step_status) && $reg_step_status !== false) { |
|
685 | + $reg_steps .= '<li style="color:#2EA2CC">'.sprintf( |
|
686 | + __('%1$s : Initiated %2$s', 'event_espresso'), |
|
687 | + ucwords(str_replace('_', ' ', $reg_step)), |
|
688 | + gmdate(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS))) |
|
689 | + ).'</li>'; |
|
690 | 690 | } else { |
691 | - $reg_steps .= '<li style="color:#E76700">' . sprintf( __( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
691 | + $reg_steps .= '<li style="color:#E76700">'.sprintf(__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
692 | 692 | } |
693 | 693 | } |
694 | 694 | $reg_steps .= '</ul>'; |
695 | 695 | $this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps; |
696 | - $this->_template_args['txn_details']['reg_steps']['label'] = __( 'Registration Step Progress', 'event_espresso' ); |
|
696 | + $this->_template_args['txn_details']['reg_steps']['label'] = __('Registration Step Progress', 'event_espresso'); |
|
697 | 697 | |
698 | 698 | |
699 | 699 | $this->_get_registrations_to_apply_payment_to(); |
700 | - $this->_get_payment_methods( $payments ); |
|
700 | + $this->_get_payment_methods($payments); |
|
701 | 701 | $this->_get_payment_status_array(); |
702 | 702 | $this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction. |
703 | 703 | |
704 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction' ), TXN_ADMIN_URL ); |
|
705 | - $this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL ); |
|
706 | - $this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL ); |
|
704 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL); |
|
705 | + $this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL); |
|
706 | + $this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL); |
|
707 | 707 | |
708 | 708 | // 'espresso_delete_payment_nonce' |
709 | 709 | |
710 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
711 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
710 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
711 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
712 | 712 | |
713 | 713 | } |
714 | 714 | |
@@ -723,27 +723,27 @@ discard block |
||
723 | 723 | * @param EE_Payment[] $payments |
724 | 724 | * @return array |
725 | 725 | */ |
726 | - protected function _get_registration_payment_IDs( $payments = array() ) { |
|
726 | + protected function _get_registration_payment_IDs($payments = array()) { |
|
727 | 727 | $existing_reg_payments = array(); |
728 | 728 | // get all reg payments for these payments |
729 | - $reg_payments = EEM_Registration_Payment::instance()->get_all( array( |
|
729 | + $reg_payments = EEM_Registration_Payment::instance()->get_all(array( |
|
730 | 730 | array( |
731 | 731 | 'PAY_ID' => array( |
732 | 732 | 'IN', |
733 | - array_keys( $payments ) |
|
733 | + array_keys($payments) |
|
734 | 734 | ) |
735 | 735 | ) |
736 | - ) ); |
|
737 | - if ( ! empty( $reg_payments ) ) { |
|
738 | - foreach ( $payments as $payment ) { |
|
739 | - if ( ! $payment instanceof EE_Payment ) { |
|
736 | + )); |
|
737 | + if ( ! empty($reg_payments)) { |
|
738 | + foreach ($payments as $payment) { |
|
739 | + if ( ! $payment instanceof EE_Payment) { |
|
740 | 740 | continue; |
741 | - } else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) { |
|
742 | - $existing_reg_payments[ $payment->ID() ] = array(); |
|
741 | + } else if ( ! isset($existing_reg_payments[$payment->ID()])) { |
|
742 | + $existing_reg_payments[$payment->ID()] = array(); |
|
743 | 743 | } |
744 | - foreach ( $reg_payments as $reg_payment ) { |
|
745 | - if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) { |
|
746 | - $existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID(); |
|
744 | + foreach ($reg_payments as $reg_payment) { |
|
745 | + if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) { |
|
746 | + $existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID(); |
|
747 | 747 | } |
748 | 748 | } |
749 | 749 | } |
@@ -780,39 +780,39 @@ discard block |
||
780 | 780 | $registrations_to_apply_payment_to .= '<br /><div class="admin-primary-mbox-tbl-wrap">'; |
781 | 781 | $registrations_to_apply_payment_to .= '<table class="admin-primary-mbox-tbl">'; |
782 | 782 | $registrations_to_apply_payment_to .= '<thead><tr>'; |
783 | - $registrations_to_apply_payment_to .= '<td>' . __( 'ID', 'event_espresso' ) . '</td>'; |
|
784 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Registrant', 'event_espresso' ) . '</td>'; |
|
785 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Ticket', 'event_espresso' ) . '</td>'; |
|
786 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Event', 'event_espresso' ) . '</td>'; |
|
787 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">' . __( 'Paid', 'event_espresso' ) . '</td>'; |
|
788 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">' . __( 'Owing', 'event_espresso' ) . '</td>'; |
|
789 | - $registrations_to_apply_payment_to .= '<td class="jst-cntr">' . __( 'Apply', 'event_espresso' ) . '</td>'; |
|
783 | + $registrations_to_apply_payment_to .= '<td>'.__('ID', 'event_espresso').'</td>'; |
|
784 | + $registrations_to_apply_payment_to .= '<td>'.__('Registrant', 'event_espresso').'</td>'; |
|
785 | + $registrations_to_apply_payment_to .= '<td>'.__('Ticket', 'event_espresso').'</td>'; |
|
786 | + $registrations_to_apply_payment_to .= '<td>'.__('Event', 'event_espresso').'</td>'; |
|
787 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">'.__('Paid', 'event_espresso').'</td>'; |
|
788 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">'.__('Owing', 'event_espresso').'</td>'; |
|
789 | + $registrations_to_apply_payment_to .= '<td class="jst-cntr">'.__('Apply', 'event_espresso').'</td>'; |
|
790 | 790 | $registrations_to_apply_payment_to .= '</tr></thead><tbody>'; |
791 | 791 | // get registrations for TXN |
792 | - $registrations = $this->_transaction->registrations( $query_params ); |
|
793 | - foreach ( $registrations as $registration ) { |
|
794 | - if ( $registration instanceof EE_Registration ) { |
|
792 | + $registrations = $this->_transaction->registrations($query_params); |
|
793 | + foreach ($registrations as $registration) { |
|
794 | + if ($registration instanceof EE_Registration) { |
|
795 | 795 | $owing = $registration->final_price() - $registration->paid(); |
796 | - $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> ' . __( '+ tax', 'event_espresso' ) . '</span>' : ''; |
|
797 | - $checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments ) ? ' checked="checked"' : ''; |
|
798 | - $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-' . $registration->ID() . '">'; |
|
796 | + $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> '.__('+ tax', 'event_espresso').'</span>' : ''; |
|
797 | + $checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments) ? ' checked="checked"' : ''; |
|
798 | + $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-'.$registration->ID().'">'; |
|
799 | 799 | // add html for checkbox input and label |
800 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ID() . '</td>'; |
|
801 | - $registrations_to_apply_payment_to .= '<td>' . $registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ) . '</td>'; |
|
802 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable . '</td>'; |
|
803 | - $registrations_to_apply_payment_to .= '<td>' . $registration->event_name() . '</td>'; |
|
804 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">' . $registration->pretty_paid() . '</td>'; |
|
805 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">' . EEH_Template::format_currency( $owing ) . '</td>'; |
|
800 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ID().'</td>'; |
|
801 | + $registrations_to_apply_payment_to .= '<td>'.$registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __('Unknown Attendee', 'event_espresso').'</td>'; |
|
802 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable.'</td>'; |
|
803 | + $registrations_to_apply_payment_to .= '<td>'.$registration->event_name().'</td>'; |
|
804 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">'.$registration->pretty_paid().'</td>'; |
|
805 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">'.EEH_Template::format_currency($owing).'</td>'; |
|
806 | 806 | $registrations_to_apply_payment_to .= '<td class="jst-cntr">'; |
807 | 807 | $disabled = $registration->final_price() > 0 ? '' : ' disabled'; |
808 | - $registrations_to_apply_payment_to .= '<input type="checkbox" value="' . $registration->ID() . '" name="txn_admin_payment[registrations]"' . $checked . $disabled . '>'; |
|
808 | + $registrations_to_apply_payment_to .= '<input type="checkbox" value="'.$registration->ID().'" name="txn_admin_payment[registrations]"'.$checked.$disabled.'>'; |
|
809 | 809 | $registrations_to_apply_payment_to .= '</td>'; |
810 | 810 | $registrations_to_apply_payment_to .= '</tr>'; |
811 | 811 | } |
812 | 812 | } |
813 | 813 | $registrations_to_apply_payment_to .= '</tbody></table></div>'; |
814 | - $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>'; |
|
815 | - $this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to; |
|
814 | + $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>'; |
|
815 | + $this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to; |
|
816 | 816 | } |
817 | 817 | |
818 | 818 | |
@@ -829,9 +829,9 @@ discard block |
||
829 | 829 | $statuses = EEM_Registration::reg_status_array(array(), TRUE); |
830 | 830 | //let's add a "don't change" option. |
831 | 831 | $status_array['NAN'] = __('Leave the Same', 'event_espresso'); |
832 | - $status_array = array_merge( $status_array, $statuses ); |
|
833 | - $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' ); |
|
834 | - $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' ); |
|
832 | + $status_array = array_merge($status_array, $statuses); |
|
833 | + $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'); |
|
834 | + $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'); |
|
835 | 835 | |
836 | 836 | } |
837 | 837 | |
@@ -846,21 +846,21 @@ discard block |
||
846 | 846 | * @param EE_Payment[] to show on this page |
847 | 847 | * @return void |
848 | 848 | */ |
849 | - private function _get_payment_methods( $payments = array() ) { |
|
849 | + private function _get_payment_methods($payments = array()) { |
|
850 | 850 | $payment_methods_of_payments = array(); |
851 | - foreach( $payments as $payment ){ |
|
852 | - if( $payment instanceof EE_Payment ){ |
|
853 | - $payment_methods_of_payments[] = $payment->get( 'PMD_ID' ); |
|
851 | + foreach ($payments as $payment) { |
|
852 | + if ($payment instanceof EE_Payment) { |
|
853 | + $payment_methods_of_payments[] = $payment->get('PMD_ID'); |
|
854 | 854 | } |
855 | 855 | } |
856 | - if( $payment_methods_of_payments ){ |
|
857 | - $query_args = array( array( 'OR*payment_method_for_payment' => array( |
|
858 | - 'PMD_ID' => array( 'IN', $payment_methods_of_payments ), |
|
859 | - 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) ); |
|
860 | - }else{ |
|
861 | - $query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ); |
|
856 | + if ($payment_methods_of_payments) { |
|
857 | + $query_args = array(array('OR*payment_method_for_payment' => array( |
|
858 | + 'PMD_ID' => array('IN', $payment_methods_of_payments), |
|
859 | + 'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') ))); |
|
860 | + } else { |
|
861 | + $query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%'))); |
|
862 | 862 | } |
863 | - $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args ); |
|
863 | + $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args); |
|
864 | 864 | } |
865 | 865 | |
866 | 866 | |
@@ -874,46 +874,46 @@ discard block |
||
874 | 874 | * @param array $metabox |
875 | 875 | * @return void |
876 | 876 | */ |
877 | - public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) { |
|
877 | + public function txn_attendees_meta_box($post, $metabox = array('args' => array())) { |
|
878 | 878 | |
879 | - extract( $metabox['args'] ); |
|
879 | + extract($metabox['args']); |
|
880 | 880 | $this->_template_args['post'] = $post; |
881 | 881 | $this->_template_args['event_attendees'] = array(); |
882 | 882 | // process items in cart |
883 | - $line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) ); |
|
884 | - if ( ! empty( $line_items )) { |
|
885 | - foreach ( $line_items as $item ) { |
|
886 | - if ( $item instanceof EE_Line_Item ) { |
|
887 | - switch( $item->OBJ_type() ) { |
|
883 | + $line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item'))); |
|
884 | + if ( ! empty($line_items)) { |
|
885 | + foreach ($line_items as $item) { |
|
886 | + if ($item instanceof EE_Line_Item) { |
|
887 | + switch ($item->OBJ_type()) { |
|
888 | 888 | |
889 | 889 | case 'Event' : |
890 | 890 | break; |
891 | 891 | |
892 | 892 | case 'Ticket' : |
893 | 893 | $ticket = $item->ticket(); |
894 | - if ( empty( $ticket )) { |
|
894 | + if (empty($ticket)) { |
|
895 | 895 | continue; //right now we're only handling tickets here. Cause its expected that only tickets will have attendees right? |
896 | 896 | } |
897 | - $ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' )); |
|
897 | + $ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price')); |
|
898 | 898 | $event = $ticket->get_first_related('Registration')->get_first_related('Event'); |
899 | - $event_name = $event instanceof EE_Event ? $event->get('EVT_name') . ' - ' . $item->get('LIN_name') : ''; |
|
899 | + $event_name = $event instanceof EE_Event ? $event->get('EVT_name').' - '.$item->get('LIN_name') : ''; |
|
900 | 900 | |
901 | - $registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() ))); |
|
902 | - foreach( $registrations as $registration ) { |
|
903 | - $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
904 | - $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
905 | - $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
901 | + $registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID()))); |
|
902 | + foreach ($registrations as $registration) { |
|
903 | + $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
904 | + $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
905 | + $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
906 | 906 | // attendee info |
907 | 907 | $attendee = $registration->get_first_related('Attendee'); |
908 | - if ( $attendee instanceof EE_Attendee ) { |
|
908 | + if ($attendee instanceof EE_Attendee) { |
|
909 | 909 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = $attendee->ID(); |
910 | 910 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = $attendee->full_name(); |
911 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:' . $attendee->email() . '?subject=' . $event->get('EVT_name') . __(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>'; |
|
912 | - $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array() ); |
|
911 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event->get('EVT_name').__(' Event', 'event_espresso').'">'.$attendee->email().'</a>'; |
|
912 | + $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array()); |
|
913 | 913 | } else { |
914 | 914 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = ''; |
915 | 915 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = ''; |
916 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
916 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
917 | 917 | $this->_template_args['event_attendees'][$registration->ID()]['address'] = ''; |
918 | 918 | } |
919 | 919 | } |
@@ -923,12 +923,12 @@ discard block |
||
923 | 923 | } |
924 | 924 | } |
925 | 925 | |
926 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees' ), TXN_ADMIN_URL ); |
|
927 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE ); |
|
926 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL); |
|
927 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE); |
|
928 | 928 | |
929 | 929 | } else { |
930 | 930 | echo sprintf( |
931 | - __( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ), |
|
931 | + __('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'), |
|
932 | 932 | '<p class="important-notice">', |
933 | 933 | '</p>' |
934 | 934 | ); |
@@ -947,20 +947,20 @@ discard block |
||
947 | 947 | */ |
948 | 948 | public function txn_registrant_side_meta_box() { |
949 | 949 | $primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null; |
950 | - if ( ! $primary_att instanceof EE_Attendee ) { |
|
950 | + if ( ! $primary_att instanceof EE_Attendee) { |
|
951 | 951 | $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'); |
952 | 952 | $primary_att = EEM_Attendee::instance()->create_default_object(); |
953 | 953 | } |
954 | - $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
954 | + $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
955 | 955 | $this->_template_args['prime_reg_fname'] = $primary_att->fname(); |
956 | 956 | $this->_template_args['prime_reg_lname'] = $primary_att->lname(); |
957 | - $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
957 | + $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
958 | 958 | $this->_template_args['prime_reg_phone'] = $primary_att->phone(); |
959 | - $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 ); |
|
959 | + $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); |
|
960 | 960 | // get formatted address for registrant |
961 | - EE_Registry::instance()->load_helper( 'Formatter' ); |
|
962 | - $this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att ); |
|
963 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE ); |
|
961 | + EE_Registry::instance()->load_helper('Formatter'); |
|
962 | + $this->_template_args['formatted_address'] = EEH_Address::format($primary_att); |
|
963 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE); |
|
964 | 964 | } |
965 | 965 | |
966 | 966 | |
@@ -976,12 +976,12 @@ discard block |
||
976 | 976 | |
977 | 977 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
978 | 978 | $this->_template_args['billing_form_url'] = add_query_arg( |
979 | - array( 'action' => 'edit_transaction', 'process' => 'billing' ), |
|
979 | + array('action' => 'edit_transaction', 'process' => 'billing'), |
|
980 | 980 | TXN_ADMIN_URL |
981 | 981 | ); |
982 | 982 | |
983 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
984 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/ |
|
983 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
984 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/ |
|
985 | 985 | } |
986 | 986 | |
987 | 987 | |
@@ -994,43 +994,43 @@ discard block |
||
994 | 994 | * @return void |
995 | 995 | */ |
996 | 996 | public function apply_payments_or_refunds() { |
997 | - $json_response_data = array( 'return_data' => FALSE ); |
|
997 | + $json_response_data = array('return_data' => FALSE); |
|
998 | 998 | $valid_data = $this->_validate_payment_request_data(); |
999 | - if ( ! empty( $valid_data ) ) { |
|
1000 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
999 | + if ( ! empty($valid_data)) { |
|
1000 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1001 | 1001 | //save the new payment |
1002 | - $payment = $this->_create_payment_from_request_data( $valid_data ); |
|
1002 | + $payment = $this->_create_payment_from_request_data($valid_data); |
|
1003 | 1003 | // get the TXN for this payment |
1004 | 1004 | $transaction = $payment->transaction(); |
1005 | 1005 | // verify transaction |
1006 | - if ( $transaction instanceof EE_Transaction ) { |
|
1006 | + if ($transaction instanceof EE_Transaction) { |
|
1007 | 1007 | // calculate_total_payments_and_update_status |
1008 | - $this->_process_transaction_payments( $transaction ); |
|
1009 | - $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment ); |
|
1010 | - $this->_remove_existing_registration_payments( $payment, $PAY_ID ); |
|
1008 | + $this->_process_transaction_payments($transaction); |
|
1009 | + $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment); |
|
1010 | + $this->_remove_existing_registration_payments($payment, $PAY_ID); |
|
1011 | 1011 | // apply payment to registrations (if applicable) |
1012 | - if ( ! empty( $REG_IDs ) ) { |
|
1013 | - $this->_update_registration_payments( $transaction, $payment, $REG_IDs ); |
|
1012 | + if ( ! empty($REG_IDs)) { |
|
1013 | + $this->_update_registration_payments($transaction, $payment, $REG_IDs); |
|
1014 | 1014 | $this->_maybe_send_notifications(); |
1015 | 1015 | // now process status changes for the same registrations |
1016 | - $this->_process_registration_status_change( $transaction, $REG_IDs ); |
|
1016 | + $this->_process_registration_status_change($transaction, $REG_IDs); |
|
1017 | 1017 | } |
1018 | - $this->_maybe_send_notifications( $payment ); |
|
1018 | + $this->_maybe_send_notifications($payment); |
|
1019 | 1019 | //prepare to render page |
1020 | - $json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs ); |
|
1021 | - do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment ); |
|
1020 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs); |
|
1021 | + do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment); |
|
1022 | 1022 | } else { |
1023 | 1023 | EE_Error::add_error( |
1024 | - __( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ), |
|
1024 | + __('A valid Transaction for this payment could not be retrieved.', 'event_espresso'), |
|
1025 | 1025 | __FILE__, __FUNCTION__, __LINE__ |
1026 | 1026 | ); |
1027 | 1027 | } |
1028 | 1028 | } else { |
1029 | - EE_Error::add_error( __( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1029 | + EE_Error::add_error(__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1030 | 1030 | } |
1031 | 1031 | |
1032 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
1033 | - echo json_encode( array_merge( $json_response_data, $notices )); |
|
1032 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
1033 | + echo json_encode(array_merge($json_response_data, $notices)); |
|
1034 | 1034 | die(); |
1035 | 1035 | } |
1036 | 1036 | |
@@ -1042,30 +1042,30 @@ discard block |
||
1042 | 1042 | * @return array |
1043 | 1043 | */ |
1044 | 1044 | protected function _validate_payment_request_data() { |
1045 | - if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) { |
|
1045 | + if ( ! isset($this->_req_data['txn_admin_payment'])) { |
|
1046 | 1046 | return false; |
1047 | 1047 | } |
1048 | 1048 | $payment_form = $this->_generate_payment_form_section(); |
1049 | 1049 | try { |
1050 | - if ( $payment_form->was_submitted() ) { |
|
1050 | + if ($payment_form->was_submitted()) { |
|
1051 | 1051 | $payment_form->receive_form_submission(); |
1052 | - if ( ! $payment_form->is_valid() ) { |
|
1052 | + if ( ! $payment_form->is_valid()) { |
|
1053 | 1053 | $submission_error_messages = array(); |
1054 | - foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) { |
|
1055 | - if ( $validation_error instanceof EE_Validation_Error ) { |
|
1054 | + foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) { |
|
1055 | + if ($validation_error instanceof EE_Validation_Error) { |
|
1056 | 1056 | $submission_error_messages[] = sprintf( |
1057 | - _x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ), |
|
1057 | + _x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'), |
|
1058 | 1058 | $validation_error->get_form_section()->html_label_text(), |
1059 | 1059 | $validation_error->getMessage() |
1060 | 1060 | ); |
1061 | 1061 | } |
1062 | 1062 | } |
1063 | - EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1063 | + EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__); |
|
1064 | 1064 | return array(); |
1065 | 1065 | } |
1066 | 1066 | } |
1067 | - } catch ( EE_Error $e ) { |
|
1068 | - EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ ); |
|
1067 | + } catch (EE_Error $e) { |
|
1068 | + EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__); |
|
1069 | 1069 | return array(); |
1070 | 1070 | } |
1071 | 1071 | return $payment_form->valid_data(); |
@@ -1087,63 +1087,63 @@ discard block |
||
1087 | 1087 | array( |
1088 | 1088 | 'default' => 0, |
1089 | 1089 | 'required' => false, |
1090 | - 'html_label_text' => __( 'Payment ID', 'event_espresso' ), |
|
1091 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1090 | + 'html_label_text' => __('Payment ID', 'event_espresso'), |
|
1091 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1092 | 1092 | ) |
1093 | 1093 | ), |
1094 | 1094 | 'TXN_ID' => new EE_Text_Input( |
1095 | 1095 | array( |
1096 | 1096 | 'default' => 0, |
1097 | 1097 | 'required' => true, |
1098 | - 'html_label_text' => __( 'Transaction ID', 'event_espresso' ), |
|
1099 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1098 | + 'html_label_text' => __('Transaction ID', 'event_espresso'), |
|
1099 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1100 | 1100 | ) |
1101 | 1101 | ), |
1102 | 1102 | 'type' => new EE_Text_Input( |
1103 | 1103 | array( |
1104 | 1104 | 'default' => 1, |
1105 | 1105 | 'required' => true, |
1106 | - 'html_label_text' => __( 'Payment or Refund', 'event_espresso' ), |
|
1107 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1106 | + 'html_label_text' => __('Payment or Refund', 'event_espresso'), |
|
1107 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1108 | 1108 | ) |
1109 | 1109 | ), |
1110 | 1110 | 'amount' => new EE_Text_Input( |
1111 | 1111 | array( |
1112 | 1112 | 'default' => 0, |
1113 | 1113 | 'required' => true, |
1114 | - 'html_label_text' => __( 'Payment amount', 'event_espresso' ), |
|
1115 | - 'validation_strategies' => array( new EE_Float_Normalization() ) |
|
1114 | + 'html_label_text' => __('Payment amount', 'event_espresso'), |
|
1115 | + 'validation_strategies' => array(new EE_Float_Normalization()) |
|
1116 | 1116 | ) |
1117 | 1117 | ), |
1118 | 1118 | 'status' => new EE_Text_Input( |
1119 | 1119 | array( |
1120 | 1120 | 'default' => EEM_Payment::status_id_approved, |
1121 | 1121 | 'required' => true, |
1122 | - 'html_label_text' => __( 'Payment status', 'event_espresso' ), |
|
1122 | + 'html_label_text' => __('Payment status', 'event_espresso'), |
|
1123 | 1123 | ) |
1124 | 1124 | ), |
1125 | 1125 | 'PMD_ID' => new EE_Text_Input( |
1126 | 1126 | array( |
1127 | 1127 | 'default' => 2, |
1128 | 1128 | 'required' => true, |
1129 | - 'html_label_text' => __( 'Payment Method', 'event_espresso' ), |
|
1130 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1129 | + 'html_label_text' => __('Payment Method', 'event_espresso'), |
|
1130 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1131 | 1131 | ) |
1132 | 1132 | ), |
1133 | 1133 | 'date' => new EE_Text_Input( |
1134 | 1134 | array( |
1135 | 1135 | 'default' => time(), |
1136 | 1136 | 'required' => true, |
1137 | - 'html_label_text' => __( 'Payment date', 'event_espresso' ), |
|
1137 | + 'html_label_text' => __('Payment date', 'event_espresso'), |
|
1138 | 1138 | ) |
1139 | 1139 | ), |
1140 | 1140 | 'txn_id_chq_nmbr' => new EE_Text_Input( |
1141 | 1141 | array( |
1142 | 1142 | 'default' => '', |
1143 | 1143 | 'required' => false, |
1144 | - 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
|
1144 | + 'html_label_text' => __('Transaction or Cheque Number', 'event_espresso'), |
|
1145 | 1145 | 'validation_strategies' => array( |
1146 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1146 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1147 | 1147 | ) |
1148 | 1148 | ) |
1149 | 1149 | ), |
@@ -1151,9 +1151,9 @@ discard block |
||
1151 | 1151 | array( |
1152 | 1152 | 'default' => '', |
1153 | 1153 | 'required' => false, |
1154 | - 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
|
1154 | + 'html_label_text' => __('Purchase Order Number', 'event_espresso'), |
|
1155 | 1155 | 'validation_strategies' => array( |
1156 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1156 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1157 | 1157 | ) |
1158 | 1158 | ) |
1159 | 1159 | ), |
@@ -1161,9 +1161,9 @@ discard block |
||
1161 | 1161 | array( |
1162 | 1162 | 'default' => '', |
1163 | 1163 | 'required' => false, |
1164 | - 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
|
1164 | + 'html_label_text' => __('Extra Field for Accounting', 'event_espresso'), |
|
1165 | 1165 | 'validation_strategies' => array( |
1166 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1166 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1167 | 1167 | ) |
1168 | 1168 | ) |
1169 | 1169 | ), |
@@ -1180,37 +1180,37 @@ discard block |
||
1180 | 1180 | * @param array $valid_data |
1181 | 1181 | * @return EE_Payment |
1182 | 1182 | */ |
1183 | - protected function _create_payment_from_request_data( $valid_data ) { |
|
1184 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
1183 | + protected function _create_payment_from_request_data($valid_data) { |
|
1184 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1185 | 1185 | // get payment amount |
1186 | - $amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0; |
|
1186 | + $amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0; |
|
1187 | 1187 | // payments have a type value of 1 and refunds have a type value of -1 |
1188 | 1188 | // so multiplying amount by type will give a positive value for payments, and negative values for refunds |
1189 | - $amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount; |
|
1189 | + $amount = $valid_data['type'] < 0 ? $amount * -1 : $amount; |
|
1190 | 1190 | // for some reason the date string coming in has extra spaces between the date and time. This fixes that. |
1191 | - $date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) ); |
|
1191 | + $date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp')); |
|
1192 | 1192 | $payment = EE_Payment::new_instance( |
1193 | 1193 | array( |
1194 | - 'TXN_ID' => $valid_data[ 'TXN_ID' ], |
|
1195 | - 'STS_ID' => $valid_data[ 'status' ], |
|
1194 | + 'TXN_ID' => $valid_data['TXN_ID'], |
|
1195 | + 'STS_ID' => $valid_data['status'], |
|
1196 | 1196 | 'PAY_timestamp' => $date, |
1197 | 1197 | 'PAY_source' => EEM_Payment_Method::scope_admin, |
1198 | - 'PMD_ID' => $valid_data[ 'PMD_ID' ], |
|
1198 | + 'PMD_ID' => $valid_data['PMD_ID'], |
|
1199 | 1199 | 'PAY_amount' => $amount, |
1200 | - 'PAY_txn_id_chq_nmbr' => $valid_data[ 'txn_id_chq_nmbr' ], |
|
1201 | - 'PAY_po_number' => $valid_data[ 'po_number' ], |
|
1202 | - 'PAY_extra_accntng' => $valid_data[ 'accounting' ], |
|
1200 | + 'PAY_txn_id_chq_nmbr' => $valid_data['txn_id_chq_nmbr'], |
|
1201 | + 'PAY_po_number' => $valid_data['po_number'], |
|
1202 | + 'PAY_extra_accntng' => $valid_data['accounting'], |
|
1203 | 1203 | 'PAY_details' => $valid_data, |
1204 | 1204 | 'PAY_ID' => $PAY_ID |
1205 | 1205 | ), |
1206 | 1206 | '', |
1207 | - array( 'Y-m-d', 'g:i a' ) |
|
1207 | + array('Y-m-d', 'g:i a') |
|
1208 | 1208 | ); |
1209 | 1209 | |
1210 | - if ( ! $payment->save() ) { |
|
1210 | + if ( ! $payment->save()) { |
|
1211 | 1211 | EE_Error::add_error( |
1212 | 1212 | sprintf( |
1213 | - __( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ), |
|
1213 | + __('Payment %1$d has not been successfully saved to the database.', 'event_espresso'), |
|
1214 | 1214 | $payment->ID() |
1215 | 1215 | ), |
1216 | 1216 | __FILE__, __FUNCTION__, __LINE__ |
@@ -1227,15 +1227,15 @@ discard block |
||
1227 | 1227 | * @param \EE_Transaction $transaction |
1228 | 1228 | * @return array |
1229 | 1229 | */ |
1230 | - protected function _process_transaction_payments( EE_Transaction $transaction ) { |
|
1230 | + protected function _process_transaction_payments(EE_Transaction $transaction) { |
|
1231 | 1231 | /** @type EE_Transaction_Payments $transaction_payments */ |
1232 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1232 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1233 | 1233 | //update the transaction with this payment |
1234 | - if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) { |
|
1235 | - EE_Error::add_success( __( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1234 | + if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) { |
|
1235 | + EE_Error::add_success(__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1236 | 1236 | } else { |
1237 | 1237 | EE_Error::add_error( |
1238 | - __( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' ) |
|
1238 | + __('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso') |
|
1239 | 1239 | , __FILE__, __FUNCTION__, __LINE__ |
1240 | 1240 | ); |
1241 | 1241 | } |
@@ -1251,19 +1251,19 @@ discard block |
||
1251 | 1251 | * @param \EE_Payment $payment |
1252 | 1252 | * @return array |
1253 | 1253 | */ |
1254 | - protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) { |
|
1254 | + protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) { |
|
1255 | 1255 | $REG_IDs = array(); |
1256 | 1256 | // grab array of IDs for specific registrations to apply changes to |
1257 | - if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) { |
|
1258 | - $REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ]; |
|
1257 | + if (isset($this->_req_data['txn_admin_payment']['registrations'])) { |
|
1258 | + $REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations']; |
|
1259 | 1259 | } |
1260 | 1260 | //nothing specified ? then get all reg IDs |
1261 | - if ( empty( $REG_IDs ) ) { |
|
1261 | + if (empty($REG_IDs)) { |
|
1262 | 1262 | $registrations = $payment->transaction()->registrations(); |
1263 | - $REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1263 | + $REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1264 | 1264 | } |
1265 | 1265 | // ensure that REG_IDs are integers and NOT strings |
1266 | - return array_map( 'intval', $REG_IDs ); |
|
1266 | + return array_map('intval', $REG_IDs); |
|
1267 | 1267 | } |
1268 | 1268 | |
1269 | 1269 | |
@@ -1280,7 +1280,7 @@ discard block |
||
1280 | 1280 | /** |
1281 | 1281 | * @param array $existing_reg_payment_REG_IDs |
1282 | 1282 | */ |
1283 | - public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) { |
|
1283 | + public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) { |
|
1284 | 1284 | $this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs; |
1285 | 1285 | } |
1286 | 1286 | |
@@ -1295,13 +1295,13 @@ discard block |
||
1295 | 1295 | * @param \EE_Payment $payment |
1296 | 1296 | * @return array |
1297 | 1297 | */ |
1298 | - protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) { |
|
1299 | - if ( $this->existing_reg_payment_REG_IDs() === null ) { |
|
1298 | + protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) { |
|
1299 | + if ($this->existing_reg_payment_REG_IDs() === null) { |
|
1300 | 1300 | // let's get any existing reg payment records for this payment |
1301 | - $existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' ); |
|
1301 | + $existing_reg_payment_REG_IDs = $payment->get_many_related('Registration'); |
|
1302 | 1302 | // but we only want the REG IDs, so grab the array keys |
1303 | - $existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array(); |
|
1304 | - $this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs ); |
|
1303 | + $existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array(); |
|
1304 | + $this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs); |
|
1305 | 1305 | } |
1306 | 1306 | return $this->existing_reg_payment_REG_IDs(); |
1307 | 1307 | } |
@@ -1320,23 +1320,23 @@ discard block |
||
1320 | 1320 | * @param int $PAY_ID |
1321 | 1321 | * @return bool; |
1322 | 1322 | */ |
1323 | - protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) { |
|
1323 | + protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) { |
|
1324 | 1324 | // newly created payments will have nothing recorded for $PAY_ID |
1325 | - if ( $PAY_ID == 0 ) { |
|
1325 | + if ($PAY_ID == 0) { |
|
1326 | 1326 | return false; |
1327 | 1327 | } |
1328 | - $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1329 | - if ( empty( $existing_reg_payment_REG_IDs )) { |
|
1328 | + $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1329 | + if (empty($existing_reg_payment_REG_IDs)) { |
|
1330 | 1330 | return false; |
1331 | 1331 | } |
1332 | 1332 | /** @type EE_Transaction_Payments $transaction_payments */ |
1333 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1333 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1334 | 1334 | return $transaction_payments->delete_registration_payments_and_update_registrations( |
1335 | 1335 | $payment, |
1336 | 1336 | array( |
1337 | 1337 | array( |
1338 | 1338 | 'PAY_ID' => $payment->ID(), |
1339 | - 'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ), |
|
1339 | + 'REG_ID' => array('IN', $existing_reg_payment_REG_IDs), |
|
1340 | 1340 | ) |
1341 | 1341 | ) |
1342 | 1342 | ); |
@@ -1355,25 +1355,25 @@ discard block |
||
1355 | 1355 | * @param array $REG_IDs |
1356 | 1356 | * @return bool |
1357 | 1357 | */ |
1358 | - protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
|
1358 | + protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) { |
|
1359 | 1359 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
1360 | 1360 | // so let's do that using our set of REG_IDs from the form |
1361 | 1361 | $registration_query_where_params = array( |
1362 | - 'REG_ID' => array( 'IN', $REG_IDs ) |
|
1362 | + 'REG_ID' => array('IN', $REG_IDs) |
|
1363 | 1363 | ); |
1364 | 1364 | // but add in some conditions regarding payment, |
1365 | 1365 | // so that we don't apply payments to registrations that are free or have already been paid for |
1366 | 1366 | // but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative ) |
1367 | - if ( ! $payment->is_a_refund() ) { |
|
1368 | - $registration_query_where_params[ 'REG_final_price' ] = array( '!=', 0 ); |
|
1369 | - $registration_query_where_params[ 'REG_final_price*' ] = array( '!=', 'REG_paid', true ); |
|
1367 | + if ( ! $payment->is_a_refund()) { |
|
1368 | + $registration_query_where_params['REG_final_price'] = array('!=', 0); |
|
1369 | + $registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true); |
|
1370 | 1370 | } |
1371 | 1371 | //EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ ); |
1372 | - $registrations = $transaction->registrations( array( $registration_query_where_params ) ); |
|
1373 | - if ( ! empty( $registrations ) ) { |
|
1372 | + $registrations = $transaction->registrations(array($registration_query_where_params)); |
|
1373 | + if ( ! empty($registrations)) { |
|
1374 | 1374 | /** @type EE_Payment_Processor $payment_processor */ |
1375 | - $payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' ); |
|
1376 | - $payment_processor->process_registration_payments( $transaction, $payment, $registrations ); |
|
1375 | + $payment_processor = EE_Registry::instance()->load_core('Payment_Processor'); |
|
1376 | + $payment_processor->process_registration_payments($transaction, $payment, $registrations); |
|
1377 | 1377 | } |
1378 | 1378 | } |
1379 | 1379 | |
@@ -1389,22 +1389,22 @@ discard block |
||
1389 | 1389 | * @param array $REG_IDs |
1390 | 1390 | * @return bool |
1391 | 1391 | */ |
1392 | - protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) { |
|
1392 | + protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) { |
|
1393 | 1393 | // first if there is no change in status then we get out. |
1394 | 1394 | if ( |
1395 | - ! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ) |
|
1395 | + ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status']) |
|
1396 | 1396 | || $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN' |
1397 | 1397 | ) { |
1398 | 1398 | //no error message, no change requested, just nothing to do man. |
1399 | 1399 | return FALSE; |
1400 | 1400 | } |
1401 | 1401 | /** @type EE_Transaction_Processor $transaction_processor */ |
1402 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
1402 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
1403 | 1403 | // made it here dude? Oh WOW. K, let's take care of changing the statuses |
1404 | 1404 | return $transaction_processor->manually_update_registration_statuses( |
1405 | 1405 | $transaction, |
1406 | - sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ), |
|
1407 | - array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) |
|
1406 | + sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']), |
|
1407 | + array(array('REG_ID' => array('IN', $REG_IDs))) |
|
1408 | 1408 | ); |
1409 | 1409 | } |
1410 | 1410 | |
@@ -1419,16 +1419,16 @@ discard block |
||
1419 | 1419 | * @param bool | null $delete_txn_reg_status_change |
1420 | 1420 | * @return array |
1421 | 1421 | */ |
1422 | - protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) { |
|
1422 | + protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) { |
|
1423 | 1423 | // was the payment deleted ? |
1424 | - if ( is_bool( $delete_txn_reg_status_change )) { |
|
1424 | + if (is_bool($delete_txn_reg_status_change)) { |
|
1425 | 1425 | return array( |
1426 | 1426 | 'PAY_ID' => $payment->ID(), |
1427 | 1427 | 'amount' => $payment->amount(), |
1428 | 1428 | 'total_paid' => $payment->transaction()->paid(), |
1429 | 1429 | 'txn_status' => $payment->transaction()->status_ID(), |
1430 | 1430 | 'pay_status' => $payment->STS_ID(), |
1431 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1431 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1432 | 1432 | 'delete_txn_reg_status_change' => $delete_txn_reg_status_change, |
1433 | 1433 | ); |
1434 | 1434 | } else { |
@@ -1440,16 +1440,16 @@ discard block |
||
1440 | 1440 | 'pay_status' => $payment->STS_ID(), |
1441 | 1441 | 'PAY_ID' => $payment->ID(), |
1442 | 1442 | 'STS_ID' => $payment->STS_ID(), |
1443 | - 'status' => self::$_pay_status[ $payment->STS_ID() ], |
|
1444 | - 'date' => $payment->timestamp( 'Y-m-d', 'h:i a' ), |
|
1445 | - 'method' => strtoupper( $payment->source() ), |
|
1443 | + 'status' => self::$_pay_status[$payment->STS_ID()], |
|
1444 | + 'date' => $payment->timestamp('Y-m-d', 'h:i a'), |
|
1445 | + 'method' => strtoupper($payment->source()), |
|
1446 | 1446 | 'PM_ID' => $payment->payment_method() ? $payment->payment_method()->ID() : 1, |
1447 | - 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __( "Unknown", 'event_espresso' ), |
|
1447 | + 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'), |
|
1448 | 1448 | 'gateway_response' => $payment->gateway_response(), |
1449 | 1449 | 'txn_id_chq_nmbr' => $payment->txn_id_chq_nmbr(), |
1450 | 1450 | 'po_number' => $payment->po_number(), |
1451 | 1451 | 'extra_accntng' => $payment->extra_accntng(), |
1452 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1452 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1453 | 1453 | ); |
1454 | 1454 | } |
1455 | 1455 | } |
@@ -1464,42 +1464,42 @@ discard block |
||
1464 | 1464 | * @return void |
1465 | 1465 | */ |
1466 | 1466 | public function delete_payment() { |
1467 | - $json_response_data = array( 'return_data' => FALSE ); |
|
1468 | - $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; |
|
1469 | - if ( $PAY_ID ) { |
|
1470 | - $delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false; |
|
1471 | - $payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID ); |
|
1472 | - if ( $payment instanceof EE_Payment ) { |
|
1473 | - $REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1467 | + $json_response_data = array('return_data' => FALSE); |
|
1468 | + $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; |
|
1469 | + if ($PAY_ID) { |
|
1470 | + $delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false; |
|
1471 | + $payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID); |
|
1472 | + if ($payment instanceof EE_Payment) { |
|
1473 | + $REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1474 | 1474 | /** @type EE_Transaction_Payments $transaction_payments */ |
1475 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1476 | - if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) { |
|
1477 | - EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) ); |
|
1478 | - $json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change ); |
|
1479 | - if ( $delete_txn_reg_status_change ) { |
|
1475 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1476 | + if ($transaction_payments->delete_payment_and_update_transaction($payment)) { |
|
1477 | + EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso')); |
|
1478 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change); |
|
1479 | + if ($delete_txn_reg_status_change) { |
|
1480 | 1480 | $this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1481 | 1481 | //MAKE sure we also add the delete_txn_req_status_change to the |
1482 | 1482 | //$_REQUEST global because that's how messages will be looking for it. |
1483 | 1483 | $_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1484 | 1484 | $this->_maybe_send_notifications(); |
1485 | - $this->_process_registration_status_change( $payment->transaction(), $REG_IDs ); |
|
1485 | + $this->_process_registration_status_change($payment->transaction(), $REG_IDs); |
|
1486 | 1486 | //$this->_maybe_send_notifications( $payment ); |
1487 | 1487 | } |
1488 | 1488 | } |
1489 | 1489 | } else { |
1490 | 1490 | EE_Error::add_error( |
1491 | - __( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ), |
|
1491 | + __('Valid Payment data could not be retrieved from the database.', 'event_espresso'), |
|
1492 | 1492 | __FILE__, __FUNCTION__, __LINE__ |
1493 | 1493 | ); |
1494 | 1494 | } |
1495 | 1495 | } else { |
1496 | 1496 | EE_Error::add_error( |
1497 | - __( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ), |
|
1497 | + __('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'), |
|
1498 | 1498 | __FILE__, __FUNCTION__, __LINE__ |
1499 | 1499 | ); |
1500 | 1500 | } |
1501 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
1502 | - echo json_encode( array_merge( $json_response_data, $notices )); |
|
1501 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
1502 | + echo json_encode(array_merge($json_response_data, $notices)); |
|
1503 | 1503 | die(); |
1504 | 1504 | } |
1505 | 1505 | |
@@ -1513,17 +1513,17 @@ discard block |
||
1513 | 1513 | * @param array $REG_IDs |
1514 | 1514 | * @return array |
1515 | 1515 | */ |
1516 | - protected function _registration_payment_data_array( $REG_IDs ) { |
|
1516 | + protected function _registration_payment_data_array($REG_IDs) { |
|
1517 | 1517 | $registration_payment_data = array(); |
1518 | 1518 | //if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows. |
1519 | - if ( ! empty( $REG_IDs ) ) { |
|
1520 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
1521 | - $registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) ); |
|
1522 | - foreach ( $registrations as $registration ) { |
|
1523 | - if ( $registration instanceof EE_Registration ) { |
|
1524 | - $registration_payment_data[ $registration->ID() ] = array( |
|
1519 | + if ( ! empty($REG_IDs)) { |
|
1520 | + EE_Registry::instance()->load_helper('Template'); |
|
1521 | + $registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs)))); |
|
1522 | + foreach ($registrations as $registration) { |
|
1523 | + if ($registration instanceof EE_Registration) { |
|
1524 | + $registration_payment_data[$registration->ID()] = array( |
|
1525 | 1525 | 'paid' => $registration->pretty_paid(), |
1526 | - 'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ), |
|
1526 | + 'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()), |
|
1527 | 1527 | ); |
1528 | 1528 | } |
1529 | 1529 | } |
@@ -1543,30 +1543,30 @@ discard block |
||
1543 | 1543 | * @access protected |
1544 | 1544 | * @param \EE_Payment | null $payment |
1545 | 1545 | */ |
1546 | - protected function _maybe_send_notifications( $payment = null ) { |
|
1547 | - switch ( $payment instanceof EE_Payment ) { |
|
1546 | + protected function _maybe_send_notifications($payment = null) { |
|
1547 | + switch ($payment instanceof EE_Payment) { |
|
1548 | 1548 | // payment notifications |
1549 | 1549 | case true : |
1550 | 1550 | if ( |
1551 | 1551 | isset( |
1552 | - $this->_req_data[ 'txn_payments' ], |
|
1553 | - $this->_req_data[ 'txn_payments' ][ 'send_notifications' ] |
|
1552 | + $this->_req_data['txn_payments'], |
|
1553 | + $this->_req_data['txn_payments']['send_notifications'] |
|
1554 | 1554 | ) && |
1555 | - filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1555 | + filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1556 | 1556 | ) { |
1557 | - $this->_process_payment_notification( $payment ); |
|
1557 | + $this->_process_payment_notification($payment); |
|
1558 | 1558 | } |
1559 | 1559 | break; |
1560 | 1560 | // registration notifications |
1561 | 1561 | case false : |
1562 | 1562 | if ( |
1563 | 1563 | isset( |
1564 | - $this->_req_data[ 'txn_reg_status_change' ], |
|
1565 | - $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] |
|
1564 | + $this->_req_data['txn_reg_status_change'], |
|
1565 | + $this->_req_data['txn_reg_status_change']['send_notifications'] |
|
1566 | 1566 | ) && |
1567 | - filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1567 | + filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1568 | 1568 | ) { |
1569 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' ); |
|
1569 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true'); |
|
1570 | 1570 | } |
1571 | 1571 | break; |
1572 | 1572 | } |
@@ -1582,11 +1582,11 @@ discard block |
||
1582 | 1582 | * @return void |
1583 | 1583 | */ |
1584 | 1584 | protected function _send_payment_reminder() { |
1585 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1586 | - $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
|
1587 | - $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
|
1588 | - do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
|
1589 | - $this->_redirect_after_action( FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE ); |
|
1585 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
1586 | + $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID); |
|
1587 | + $query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array(); |
|
1588 | + do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction); |
|
1589 | + $this->_redirect_after_action(FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE); |
|
1590 | 1590 | } |
1591 | 1591 | |
1592 | 1592 | |
@@ -1600,36 +1600,36 @@ discard block |
||
1600 | 1600 | * @param string $view |
1601 | 1601 | * @return mixed int = count || array of transaction objects |
1602 | 1602 | */ |
1603 | - public function get_transactions( $perpage, $count = FALSE, $view = '' ) { |
|
1603 | + public function get_transactions($perpage, $count = FALSE, $view = '') { |
|
1604 | 1604 | |
1605 | 1605 | $TXN = EEM_Transaction::instance(); |
1606 | 1606 | |
1607 | - $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' )); |
|
1608 | - $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' ); |
|
1607 | + $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')); |
|
1608 | + $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'); |
|
1609 | 1609 | |
1610 | 1610 | //make sure our timestamps start and end right at the boundaries for each day |
1611 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1612 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1611 | + $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00'; |
|
1612 | + $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59'; |
|
1613 | 1613 | |
1614 | 1614 | |
1615 | 1615 | //convert to timestamps |
1616 | - $start_date = strtotime( $start_date ); |
|
1617 | - $end_date = strtotime( $end_date ); |
|
1616 | + $start_date = strtotime($start_date); |
|
1617 | + $end_date = strtotime($end_date); |
|
1618 | 1618 | |
1619 | 1619 | //makes sure start date is the lowest value and vice versa |
1620 | - $start_date = min( $start_date, $end_date ); |
|
1621 | - $end_date = max( $start_date, $end_date ); |
|
1620 | + $start_date = min($start_date, $end_date); |
|
1621 | + $end_date = max($start_date, $end_date); |
|
1622 | 1622 | |
1623 | 1623 | //convert to correct format for query |
1624 | - $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' ); |
|
1625 | - $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' ); |
|
1624 | + $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'); |
|
1625 | + $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'); |
|
1626 | 1626 | |
1627 | 1627 | |
1628 | 1628 | |
1629 | 1629 | //set orderby |
1630 | 1630 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1631 | 1631 | |
1632 | - switch ( $this->_req_data['orderby'] ) { |
|
1632 | + switch ($this->_req_data['orderby']) { |
|
1633 | 1633 | case 'TXN_ID': |
1634 | 1634 | $orderby = 'TXN_ID'; |
1635 | 1635 | break; |
@@ -1643,66 +1643,66 @@ discard block |
||
1643 | 1643 | $orderby = 'TXN_timestamp'; |
1644 | 1644 | } |
1645 | 1645 | |
1646 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC'; |
|
1647 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
1648 | - $per_page = isset( $perpage ) && !empty( $perpage ) ? $perpage : 10; |
|
1649 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
1646 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC'; |
|
1647 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
1648 | + $per_page = isset($perpage) && ! empty($perpage) ? $perpage : 10; |
|
1649 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
1650 | 1650 | |
1651 | - $offset = ($current_page-1)*$per_page; |
|
1652 | - $limit = array( $offset, $per_page ); |
|
1651 | + $offset = ($current_page - 1) * $per_page; |
|
1652 | + $limit = array($offset, $per_page); |
|
1653 | 1653 | |
1654 | 1654 | $_where = array( |
1655 | - 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ), |
|
1655 | + 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)), |
|
1656 | 1656 | 'Registration.REG_count' => 1 |
1657 | 1657 | ); |
1658 | 1658 | |
1659 | - if ( isset( $this->_req_data['EVT_ID'] ) ) { |
|
1659 | + if (isset($this->_req_data['EVT_ID'])) { |
|
1660 | 1660 | $_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID']; |
1661 | 1661 | } |
1662 | 1662 | |
1663 | - if ( isset( $this->_req_data['s'] ) ) { |
|
1664 | - $search_string = '%' . $this->_req_data['s'] . '%'; |
|
1663 | + if (isset($this->_req_data['s'])) { |
|
1664 | + $search_string = '%'.$this->_req_data['s'].'%'; |
|
1665 | 1665 | $_where['OR'] = array( |
1666 | - 'Registration.Event.EVT_name' => array( 'LIKE', $search_string ), |
|
1667 | - 'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ), |
|
1668 | - 'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ), |
|
1669 | - 'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ), |
|
1670 | - 'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ), |
|
1671 | - 'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ), |
|
1672 | - 'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ), |
|
1673 | - 'Registration.Attendee.ATT_email' => array('LIKE', $search_string ), |
|
1674 | - 'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ), |
|
1675 | - 'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ), |
|
1676 | - 'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ), |
|
1677 | - 'Registration.REG_final_price' => array( 'LIKE', $search_string ), |
|
1678 | - 'Registration.REG_code' => array( 'LIKE', $search_string ), |
|
1679 | - 'Registration.REG_count' => array( 'LIKE' , $search_string ), |
|
1680 | - 'Registration.REG_group_size' => array( 'LIKE' , $search_string ), |
|
1681 | - 'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ), |
|
1682 | - 'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ), |
|
1683 | - 'Payment.PAY_source' => array('LIKE', $search_string ), |
|
1684 | - 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ), |
|
1685 | - 'TXN_session_data' => array( 'LIKE', $search_string ), |
|
1686 | - 'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string ) |
|
1666 | + 'Registration.Event.EVT_name' => array('LIKE', $search_string), |
|
1667 | + 'Registration.Event.EVT_desc' => array('LIKE', $search_string), |
|
1668 | + 'Registration.Event.EVT_short_desc' => array('LIKE', $search_string), |
|
1669 | + 'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string), |
|
1670 | + 'Registration.Attendee.ATT_fname' => array('LIKE', $search_string), |
|
1671 | + 'Registration.Attendee.ATT_lname' => array('LIKE', $search_string), |
|
1672 | + 'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string), |
|
1673 | + 'Registration.Attendee.ATT_email' => array('LIKE', $search_string), |
|
1674 | + 'Registration.Attendee.ATT_address' => array('LIKE', $search_string), |
|
1675 | + 'Registration.Attendee.ATT_address2' => array('LIKE', $search_string), |
|
1676 | + 'Registration.Attendee.ATT_city' => array('LIKE', $search_string), |
|
1677 | + 'Registration.REG_final_price' => array('LIKE', $search_string), |
|
1678 | + 'Registration.REG_code' => array('LIKE', $search_string), |
|
1679 | + 'Registration.REG_count' => array('LIKE', $search_string), |
|
1680 | + 'Registration.REG_group_size' => array('LIKE', $search_string), |
|
1681 | + 'Registration.Ticket.TKT_name' => array('LIKE', $search_string), |
|
1682 | + 'Registration.Ticket.TKT_description' => array('LIKE', $search_string), |
|
1683 | + 'Payment.PAY_source' => array('LIKE', $search_string), |
|
1684 | + 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string), |
|
1685 | + 'TXN_session_data' => array('LIKE', $search_string), |
|
1686 | + 'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string) |
|
1687 | 1687 | ); |
1688 | 1688 | } |
1689 | 1689 | |
1690 | 1690 | //failed transactions |
1691 | - $failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE; |
|
1692 | - $abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE; |
|
1691 | + $failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE : FALSE; |
|
1692 | + $abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE : FALSE; |
|
1693 | 1693 | |
1694 | - if ( $failed ) { |
|
1695 | - $_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code; |
|
1696 | - } else if ( $abandoned ) { |
|
1694 | + if ($failed) { |
|
1695 | + $_where['STS_ID'] = EEM_Transaction::failed_status_code; |
|
1696 | + } else if ($abandoned) { |
|
1697 | 1697 | $_where['STS_ID'] = EEM_Transaction::abandoned_status_code; |
1698 | 1698 | } else { |
1699 | - $_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code ); |
|
1700 | - $_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code ); |
|
1699 | + $_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code); |
|
1700 | + $_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code); |
|
1701 | 1701 | } |
1702 | 1702 | |
1703 | - $query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit ); |
|
1703 | + $query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit); |
|
1704 | 1704 | |
1705 | - $transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params); |
|
1705 | + $transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params); |
|
1706 | 1706 | |
1707 | 1707 | |
1708 | 1708 | return $transactions; |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | function ee_resurse_into_array($data) { |
9 | 9 | if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {//is_object($incomplete_class) actually returns false, hence why we check for it |
10 | - $data = (array)$data; |
|
10 | + $data = (array) $data; |
|
11 | 11 | } |
12 | 12 | if (is_array($data)) { |
13 | 13 | if (EEH_Array::is_associative_array($data)) { |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | ?> |
20 | 20 | <tr> |
21 | 21 | <td> |
22 | - <?php echo $data_key;?> |
|
22 | + <?php echo $data_key; ?> |
|
23 | 23 | </td> |
24 | 24 | <td> |
25 | - <?php ee_resurse_into_array($data_values);?> |
|
25 | + <?php ee_resurse_into_array($data_values); ?> |
|
26 | 26 | </td> |
27 | 27 | </tr> |
28 | 28 | <?php |
@@ -36,31 +36,31 @@ discard block |
||
36 | 36 | <ul> |
37 | 37 | <?php |
38 | 38 | foreach ($data as $datum) { |
39 | - echo "<li>";ee_resurse_into_array($datum);echo "</li>"; |
|
39 | + echo "<li>"; ee_resurse_into_array($datum); echo "</li>"; |
|
40 | 40 | }?> |
41 | 41 | </ul> |
42 | 42 | <?php |
43 | 43 | } |
44 | - }else { |
|
44 | + } else { |
|
45 | 45 | //simple value |
46 | 46 | echo $data; |
47 | 47 | } |
48 | 48 | } |
49 | 49 | ?> |
50 | 50 | <h1> |
51 | - <?php _e("System Information", "event_espresso");?> |
|
51 | + <?php _e("System Information", "event_espresso"); ?> |
|
52 | 52 | </h1> |
53 | 53 | <div class="padding"> |
54 | - <h2><?php _e("Raw System Data", "event_espresso");?></h2> |
|
54 | + <h2><?php _e("Raw System Data", "event_espresso"); ?></h2> |
|
55 | 55 | <textarea class="system_status_info"> |
56 | 56 | <?php print_r($system_stati)?> |
57 | 57 | </textarea> |
58 | - <h2><?php _e("System Data (formatted)", "event_espresso");?></h2> |
|
58 | + <h2><?php _e("System Data (formatted)", "event_espresso"); ?></h2> |
|
59 | 59 | <table class="widefat"> |
60 | 60 | <?php |
61 | 61 | foreach ($system_stati as $status_category_slug => $data) { |
62 | 62 | if (is_object($data)) { |
63 | - $data = (array)$data; |
|
63 | + $data = (array) $data; |
|
64 | 64 | } |
65 | 65 | ?> |
66 | 66 | <thead> |