@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | * @since $VID:$ |
11 | 11 | * |
12 | 12 | */ |
13 | -class EE_PMT_Paypal_Standard extends EE_PMT_Base{ |
|
13 | +class EE_PMT_Paypal_Standard extends EE_PMT_Base { |
|
14 | 14 | |
15 | 15 | const shipping_info_none = 1; |
16 | 16 | const shipping_info_optional = 0; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | require_once($this->file_folder().'EEG_Paypal_Standard.gateway.php'); |
27 | 27 | $this->_gateway = new EEG_Paypal_Standard(); |
28 | 28 | $this->_pretty_name = __("Paypal Standard", 'event_espresso'); |
29 | - $this->_default_description = sprintf( __( 'Upon submitting this form, you will be forwarded to PayPal to make your payment. %1$sMake sure you return to this site in order to properly finalize your registration.%2$s', 'event_espresso' ), '<strong>', '</strong>' ); |
|
29 | + $this->_default_description = sprintf(__('Upon submitting this form, you will be forwarded to PayPal to make your payment. %1$sMake sure you return to this site in order to properly finalize your registration.%2$s', 'event_espresso'), '<strong>', '</strong>'); |
|
30 | 30 | parent::__construct($pm_instance); |
31 | 31 | $this->_default_button_url = $this->file_url().'lib'.DS.'paypal-logo.png'; |
32 | 32 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param \EE_Transaction $transaction |
39 | 39 | * @return NULL |
40 | 40 | */ |
41 | - public function generate_new_billing_form( EE_Transaction $transaction = NULL ) { |
|
41 | + public function generate_new_billing_form(EE_Transaction $transaction = NULL) { |
|
42 | 42 | return NULL; |
43 | 43 | } |
44 | 44 | |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | * @return EE_Payment_Method_Form |
50 | 50 | */ |
51 | 51 | public function generate_new_settings_form() { |
52 | - require_once( $this->file_folder() . 'EE_Paypal_Standard_Form.form.php' ); |
|
53 | - $form = new EE_Paypal_Standard_Form( $this ); |
|
54 | - $form->get_input('PMD_debug_mode')->set_html_label_text(sprintf(__("Use Paypal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())); |
|
55 | - $form->get_input('shipping_details')->set_html_label_text(sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())); |
|
52 | + require_once($this->file_folder().'EE_Paypal_Standard_Form.form.php'); |
|
53 | + $form = new EE_Paypal_Standard_Form($this); |
|
54 | + $form->get_input('PMD_debug_mode')->set_html_label_text(sprintf(__("Use Paypal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())); |
|
55 | + $form->get_input('shipping_details')->set_html_label_text(sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())); |
|
56 | 56 | return $form; |
57 | 57 | } |
58 | 58 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * @see EE_PMT_Base::help_tabs_config() |
64 | 64 | * @return array |
65 | 65 | */ |
66 | - public function help_tabs_config(){ |
|
66 | + public function help_tabs_config() { |
|
67 | 67 | return array( |
68 | 68 | $this->get_help_tab_name() => array( |
69 | 69 | 'title'=> __("Paypal Standard Settings", 'event_espresso'), |
@@ -84,14 +84,14 @@ discard block |
||
84 | 84 | * @param EE_Transaction $transaction |
85 | 85 | * @return EE_Payment |
86 | 86 | */ |
87 | - public function finalize_payment_for($transaction){ |
|
87 | + public function finalize_payment_for($transaction) { |
|
88 | 88 | //paypal standard actually sends teh IPN info along with the user |
89 | 89 | //when they return to our site |
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | - if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
|
92 | - return $this->handle_ipn($_POST, $transaction ); |
|
93 | - }else{ |
|
94 | - return parent::finalize_payment_for( $transaction ); |
|
91 | + if ($_SERVER['REQUEST_METHOD'] == 'POST') { |
|
92 | + return $this->handle_ipn($_POST, $transaction); |
|
93 | + } else { |
|
94 | + return parent::finalize_payment_for($transaction); |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 |
@@ -90,7 +90,7 @@ |
||
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | 91 | if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
92 | 92 | return $this->handle_ipn($_POST, $transaction ); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return parent::finalize_payment_for( $transaction ); |
95 | 95 | } |
96 | 96 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | |
6 | 6 | /** |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | * |
16 | 16 | */ |
17 | 17 | class EE_Paypal_Standard_Form extends EE_Payment_Method_Form { |
18 | - protected function _normalize( $req_data ) { |
|
19 | - parent::_normalize( $req_data ); |
|
18 | + protected function _normalize($req_data) { |
|
19 | + parent::_normalize($req_data); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
23 | 23 | * |
24 | 24 | * @param EE_PMT_Paypal_Standard $payment_method_type |
25 | 25 | */ |
26 | - public function __construct( $payment_method_type ){ |
|
26 | + public function __construct($payment_method_type) { |
|
27 | 27 | $options_array = array( |
28 | 28 | 'payment_method_type' => $payment_method_type, |
29 | 29 | 'extra_meta_inputs'=>array( |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | )), |
35 | 35 | 'image_url'=>new EE_Admin_File_Uploader_Input(array( |
36 | 36 | 'html_help_text'=> __("Used for your business/personal logo on the PayPal page", 'event_espresso'), |
37 | - 'html_label_text' => __( 'Image URL', 'event_espresso' ) |
|
37 | + 'html_label_text' => __('Image URL', 'event_espresso') |
|
38 | 38 | )), |
39 | 39 | 'shipping_details'=>new EE_Select_Input(array( |
40 | 40 | EE_PMT_Paypal_Standard::shipping_info_none => __("Do not prompt for an address", 'event_espresso'), |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'before_form_content_template'=>$payment_method_type->file_folder().DS.'templates'.DS.'paypal_standard_settings_before_form.template.php', |
46 | 46 | ); |
47 | 47 | |
48 | - parent::__construct( $options_array ); |
|
48 | + parent::__construct($options_array); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | <?php _e('Adjust the settings for the PayPal Standard payment gateway.', 'event_espresso'); ?> |
4 | 4 | </p> |
5 | 5 | <p> |
6 | -<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso' ), "<a href='https://www.paypal.com/multicurrency' target='_blank'>","</a>" ); ?> |
|
6 | +<?php printf(__('See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso'), "<a href='https://www.paypal.com/multicurrency' target='_blank'>", "</a>"); ?> |
|
7 | 7 | </p> |
8 | 8 | <h3><?php _e('PayPal Standard Settings', 'event_espresso'); ?></h3> |
9 | 9 | <ul> |
@@ -21,17 +21,17 @@ discard block |
||
21 | 21 | </li> |
22 | 22 | <li> |
23 | 23 | <strong><?php _e('PayPal Calculates Taxes', 'event_espresso'); ?></strong><br /> |
24 | -<?php printf( __('If set to "Yes", we will indicate to PayPal that it ought to calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>' ); ?><br/> |
|
25 | -<?php _e( 'Important Note: PayPal calculates its taxes ONLY ON TAXABLE tickets. So if you mark an Event Espresso ticket as being non-taxable, PayPal will also respect that setting and those items will NOT be taxed.', 'event_espresso' );?> |
|
24 | +<?php printf(__('If set to "Yes", we will indicate to PayPal that it ought to calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>'); ?><br/> |
|
25 | +<?php _e('Important Note: PayPal calculates its taxes ONLY ON TAXABLE tickets. So if you mark an Event Espresso ticket as being non-taxable, PayPal will also respect that setting and those items will NOT be taxed.', 'event_espresso'); ?> |
|
26 | 26 | </li> |
27 | 27 | <li> |
28 | 28 | <strong><?php _e('PayPal Calculates Shipping', 'event_espresso'); ?></strong><br /> |
29 | 29 | <?php _e('Similar to the "PayPal Calculates Taxes" setting, if this is set to "Yes", we will indicate to PayPal that it ought to calculate the shipping on the order and it.', 'event_espresso'); ?><br/> |
30 | -<?php _e( 'Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso' );?> |
|
30 | +<?php _e('Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso'); ?> |
|
31 | 31 | <li> |
32 | -<strong><?php _e( 'Notes Regarding Paypal Taxes and Shipping', 'event_espresso' );?></strong><br/> |
|
33 | -<?php _e( 'If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso' );?><br/> |
|
34 | -<?php _e( 'However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso' );?> |
|
32 | +<strong><?php _e('Notes Regarding Paypal Taxes and Shipping', 'event_espresso'); ?></strong><br/> |
|
33 | +<?php _e('If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso'); ?><br/> |
|
34 | +<?php _e('However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso'); ?> |
|
35 | 35 | </li> |
36 | 36 | <li> |
37 | 37 | <strong><?php _e('Shipping Address Options', 'event_espresso'); ?></strong><br /> |
@@ -3,27 +3,27 @@ |
||
3 | 3 | if (!defined('EVENT_ESPRESSO_VERSION')) |
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | - * Event Espresso |
|
7 | - * |
|
8 | - * Event Registration and Management Plugin for WordPress |
|
9 | - * |
|
10 | - * @ package Event Espresso |
|
11 | - * @ author Seth Shoultes |
|
12 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
13 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
14 | - * @ link http://www.eventespresso.com |
|
15 | - * @ version 4.3 |
|
16 | - * |
|
17 | - * ------------------------------------------------------------------------ |
|
18 | - * |
|
19 | - * paypal_standard_settings_before_form |
|
20 | - * |
|
21 | - * @package Event Espresso |
|
22 | - * @subpackage |
|
23 | - * @author Mike Nelson |
|
24 | - * |
|
25 | - * ------------------------------------------------------------------------ |
|
26 | - */ |
|
6 | + * Event Espresso |
|
7 | + * |
|
8 | + * Event Registration and Management Plugin for WordPress |
|
9 | + * |
|
10 | + * @ package Event Espresso |
|
11 | + * @ author Seth Shoultes |
|
12 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
13 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
14 | + * @ link http://www.eventespresso.com |
|
15 | + * @ version 4.3 |
|
16 | + * |
|
17 | + * ------------------------------------------------------------------------ |
|
18 | + * |
|
19 | + * paypal_standard_settings_before_form |
|
20 | + * |
|
21 | + * @package Event Espresso |
|
22 | + * @subpackage |
|
23 | + * @author Mike Nelson |
|
24 | + * |
|
25 | + * ------------------------------------------------------------------------ |
|
26 | + */ |
|
27 | 27 | ?> |
28 | 28 | <strong style="color:#F00"><?php _e('Please Note:','event_espresso')?></strong> <?php _e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly. ", 'event_espresso'); |
29 | 29 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * ------------------------------------------------------------------------ |
26 | 26 | */ |
27 | 27 | ?> |
28 | -<strong style="color:#F00"><?php _e('Please Note:','event_espresso')?></strong> <?php _e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly. ", 'event_espresso'); |
|
28 | +<strong style="color:#F00"><?php _e('Please Note:', 'event_espresso')?></strong> <?php _e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly. ", 'event_espresso'); |
|
29 | 29 | |
30 | 30 | |
31 | 31 | // End of file paypal_standard_settings_before_form.template.php |
32 | 32 | \ No newline at end of file |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if (!defined('EVENT_ESPRESSO_VERSION')) { |
|
4 | 4 | exit('No direct script access allowed'); |
5 | +} |
|
5 | 6 | /** |
6 | 7 | * Event Espresso |
7 | 8 | * |
@@ -16,11 +16,11 @@ |
||
16 | 16 | |
17 | 17 | <section id="primary" class="content-area"> |
18 | 18 | <div id="content" class="site-content" role="main"> |
19 | - <?php espresso_get_template_part( 'loop', 'espresso_events' ); ?> |
|
19 | + <?php espresso_get_template_part('loop', 'espresso_events'); ?> |
|
20 | 20 | </div><!-- #content --> |
21 | 21 | </section><!-- #primary --> |
22 | 22 | |
23 | 23 | <?php |
24 | -get_sidebar( 'content' ); |
|
24 | +get_sidebar('content'); |
|
25 | 25 | get_sidebar(); |
26 | 26 | get_footer(); |
@@ -18,11 +18,11 @@ |
||
18 | 18 | |
19 | 19 | <section id="primary" class="content-area"> |
20 | 20 | <div id="content" class="site-content" role="main"> |
21 | - <?php espresso_get_template_part( 'loop', 'espresso_venues' ); ?> |
|
21 | + <?php espresso_get_template_part('loop', 'espresso_venues'); ?> |
|
22 | 22 | </div><!-- #content --> |
23 | 23 | </section><!-- #primary --> |
24 | 24 | |
25 | 25 | <?php |
26 | -get_sidebar( 'content' ); |
|
26 | +get_sidebar('content'); |
|
27 | 27 | get_sidebar(); |
28 | 28 | get_footer(); |
29 | 29 | \ No newline at end of file |
@@ -1,15 +1,15 @@ |
||
1 | 1 | <?php |
2 | 2 | //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>'; |
3 | 3 | |
4 | -if ( is_single() || is_archive() && espresso_display_datetimes_in_event_list() ) : |
|
4 | +if (is_single() || is_archive() && espresso_display_datetimes_in_event_list()) : |
|
5 | 5 | global $post; |
6 | -do_action( 'AHEE_event_details_before_event_date', $post ); |
|
6 | +do_action('AHEE_event_details_before_event_date', $post); |
|
7 | 7 | ?> |
8 | 8 | <div class="event-datetimes"> |
9 | - <?php espresso_list_of_event_dates( $post->ID );?> |
|
9 | + <?php espresso_list_of_event_dates($post->ID); ?> |
|
10 | 10 | </div> |
11 | 11 | <!-- .event-datetimes --> |
12 | 12 | <?php |
13 | -do_action( 'AHEE_event_details_after_event_date', $post ); |
|
13 | +do_action('AHEE_event_details_after_event_date', $post); |
|
14 | 14 | endif; |
15 | 15 | ?> |
16 | 16 | \ No newline at end of file |
@@ -3,29 +3,29 @@ |
||
3 | 3 | global $post; |
4 | 4 | ?> |
5 | 5 | <div class="event-content"> |
6 | -<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?> |
|
6 | +<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?> |
|
7 | 7 | <div class="entry-meta"> |
8 | - <span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span> |
|
8 | + <span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span> |
|
9 | 9 | <?php |
10 | - if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : |
|
10 | + if ( ! post_password_required() && (comments_open() || get_comments_number())) : |
|
11 | 11 | ?> |
12 | - <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span> |
|
12 | + <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span> |
|
13 | 13 | <?php |
14 | 14 | endif; |
15 | - edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' ); |
|
15 | + edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>'); |
|
16 | 16 | ?> |
17 | 17 | </div> |
18 | 18 | <?php endif; |
19 | - $event_phone = espresso_event_phone( $post->ID, FALSE ); |
|
20 | - if ( $event_phone != '' ) : ?> |
|
19 | + $event_phone = espresso_event_phone($post->ID, FALSE); |
|
20 | + if ($event_phone != '') : ?> |
|
21 | 21 | <p> |
22 | - <span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?> |
|
22 | + <span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?> |
|
23 | 23 | </p> |
24 | -<?php endif; ?> |
|
24 | +<?php endif; ?> |
|
25 | 25 | <?php |
26 | - do_action( 'AHEE_event_details_before_the_content', $post ); |
|
26 | + do_action('AHEE_event_details_before_the_content', $post); |
|
27 | 27 | espresso_event_content_or_excerpt(); |
28 | - do_action( 'AHEE_event_details_after_the_content', $post ); |
|
28 | + do_action('AHEE_event_details_after_the_content', $post); |
|
29 | 29 | ?> |
30 | 30 | </div> |
31 | 31 | <!-- .event-content --> |
@@ -3,12 +3,12 @@ |
||
3 | 3 | global $post; |
4 | 4 | ?> |
5 | 5 | <header class="event-header"> |
6 | - <?php if ( is_single() ) : ?> |
|
6 | + <?php if (is_single()) : ?> |
|
7 | 7 | <h1 id="event-details-h1-<?php echo $post->ID; ?>" class="entry-title"> |
8 | 8 | <?php else : ?> |
9 | 9 | <h2 id="event-details-h2-<?php echo $post->ID; ?>" class="entry-title"> |
10 | 10 | <?php endif; ?> |
11 | 11 | <a class="" href="<?php the_permalink(); ?>"><?php the_title(); ?></a> |
12 | - <?php if ( is_single() ) : ?></h1><?php else : ?></h2><?php endif; ?> |
|
13 | - <?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?> |
|
12 | + <?php if (is_single()) : ?></h1><?php else : ?></h2><?php endif; ?> |
|
13 | + <?php if ( ! is_archive() && has_excerpt($post->ID)): the_excerpt(); endif; ?> |
|
14 | 14 | </header> |
@@ -5,10 +5,16 @@ |
||
5 | 5 | <header class="event-header"> |
6 | 6 | <?php if ( is_single() ) : ?> |
7 | 7 | <h1 id="event-details-h1-<?php echo $post->ID; ?>" class="entry-title"> |
8 | - <?php else : ?> |
|
9 | - <h2 id="event-details-h2-<?php echo $post->ID; ?>" class="entry-title"> |
|
8 | + <?php else { |
|
9 | + : ?> |
|
10 | + <h2 id="event-details-h2-<?php echo $post->ID; |
|
11 | +} |
|
12 | +?>" class="entry-title"> |
|
10 | 13 | <?php endif; ?> |
11 | 14 | <a class="" href="<?php the_permalink(); ?>"><?php the_title(); ?></a> |
12 | - <?php if ( is_single() ) : ?></h1><?php else : ?></h2><?php endif; ?> |
|
15 | + <?php if ( is_single() ) : ?></h1><?php else { |
|
16 | + : ?></h2><?php endif; |
|
17 | +} |
|
18 | +?> |
|
13 | 19 | <?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?> |
14 | 20 | </header> |