Completed
Branch BUG/paypal-express-and-plus-si... (305384)
by
unknown
08:50 queued 37s
created
ticket_selector_caff/templates/ticket_selector_price_details.template.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -7,39 +7,39 @@  discard block
 block discarded – undo
7 7
 if ($display_ticket_price) { ?>
8 8
     <section class="tckt-slctr-tkt-price-sctn">
9 9
         <h5><?php
10
-            echo apply_filters(
11
-                'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
12
-                esc_html__('Price', 'event_espresso')
13
-            ); ?></h5>
10
+			echo apply_filters(
11
+				'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
12
+				esc_html__('Price', 'event_espresso')
13
+			); ?></h5>
14 14
         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
15 15
             <table class="tckt-slctr-tkt-details-tbl">
16 16
                 <thead>
17 17
                 <tr>
18 18
                     <th class="ee-third-width"><span class="small-text">
19 19
                             <?php
20
-                            esc_html_e(
21
-                                'Name',
22
-                                'event_espresso'
23
-                            ); ?></span>
20
+							esc_html_e(
21
+								'Name',
22
+								'event_espresso'
23
+							); ?></span>
24 24
                     </th>
25 25
                     <th class="jst-cntr"><span class="small-text">
26 26
                             <?php
27
-                            esc_html_e(
28
-                                'Description',
29
-                                'event_espresso'
30
-                            ); ?></span>
27
+							esc_html_e(
28
+								'Description',
29
+								'event_espresso'
30
+							); ?></span>
31 31
                     </th>
32 32
                     <th class="ee-fourth-width jst-rght"><span class="small-text">
33 33
                             <?php
34
-                            esc_html_e(
35
-                                'Amount',
36
-                                'event_espresso'
37
-                            ); ?></span></th>
34
+							esc_html_e(
35
+								'Amount',
36
+								'event_espresso'
37
+							); ?></span></th>
38 38
                 </tr>
39 39
                 </thead>
40 40
                 <tbody>
41 41
                 <?php
42
-                if ($ticket->base_price() instanceof EE_Price) { ?>
42
+				if ($ticket->base_price() instanceof EE_Price) { ?>
43 43
                     <tr>
44 44
                         <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>" class="small-text" colspan="2">
45 45
                             <b><?php echo $ticket->base_price()->name(); ?></b></td>
@@ -47,12 +47,12 @@  discard block
 block discarded – undo
47 47
                             class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
48 48
                     </tr>
49 49
                     <?php
50
-                    $running_total = $ticket->base_price()->amount();
51
-                } else {
52
-                    $running_total = 0;
53
-                }
54
-                // now add price modifiers
55
-                foreach ($ticket->price_modifiers() as $price_mod) { ?>
50
+					$running_total = $ticket->base_price()->amount();
51
+				} else {
52
+					$running_total = 0;
53
+				}
54
+				// now add price modifiers
55
+				foreach ($ticket->price_modifiers() as $price_mod) { ?>
56 56
                     <tr>
57 57
                         <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>"
58 58
                             class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
@@ -62,23 +62,23 @@  discard block
 block discarded – undo
62 62
                                 %
63 63
                             </td>
64 64
                             <?php
65
-                            $new_sub_total = $running_total * ($price_mod->amount() / 100);
66
-                            $new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
67
-                            ?>
65
+							$new_sub_total = $running_total * ($price_mod->amount() / 100);
66
+							$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
67
+							?>
68 68
                         <?php } else { ?>
69 69
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
70
-                                : $price_mod->amount(); ?>
70
+								: $price_mod->amount(); ?>
71 71
                             <td data-th="<?php esc_html_e('Description', 'event_espresso'); ?>"
72 72
                                 class="small-text"><?php echo $price_mod->desc(); ?></td>
73 73
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
74
-                                : $price_mod->amount(); ?>
74
+								: $price_mod->amount(); ?>
75 75
                         <?php } ?>
76 76
                         <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>"
77 77
                             class="jst-rght small-text">
78 78
                             <?php
79
-                            echo EEH_Template::format_currency(
80
-                                $new_sub_total
81
-                            ); ?></td>
79
+							echo EEH_Template::format_currency(
80
+								$new_sub_total
81
+							); ?></td>
82 82
                         <?php $running_total += $new_sub_total; ?>
83 83
                     </tr>
84 84
                 <?php } ?>
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
                     <tr>
88 88
                         <td colspan="2" class="jst-rght small-text sbttl"><b>
89 89
                                 <?php
90
-                                esc_html_e(
91
-                                    'subtotal',
92
-                                    'event_espresso'
93
-                                ); ?></b></td>
90
+								esc_html_e(
91
+									'subtotal',
92
+									'event_espresso'
93
+								); ?></b></td>
94 94
                         <td data-th="<?php esc_html_e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text">
95 95
                             <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
96 96
                     </tr>
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
106 106
                             <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>"
107 107
                                 class="jst-rght small-text">
108 108
                                 <?php
109
-                                echo EEH_Template::format_currency(
110
-                                    $tax_amount
111
-                                ); ?></td>
109
+								echo EEH_Template::format_currency(
110
+									$tax_amount
111
+								); ?></td>
112 112
                             <?php $running_total += $tax_amount; ?>
113 113
                         </tr>
114 114
                     <?php } ?>
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
116 116
                 <tr>
117 117
                     <td colspan="2" class="jst-rght small-text ttl-lbl-td">
118 118
                         <b><?php
119
-                            echo apply_filters(
120
-                                'FHEE__ticket_selector_chart_template__ticket_details_total_price',
121
-                                esc_html__('Total', 'event_espresso')
122
-                            ); ?></b></td>
119
+							echo apply_filters(
120
+								'FHEE__ticket_selector_chart_template__ticket_details_total_price',
121
+								esc_html__('Total', 'event_espresso')
122
+							); ?></b></td>
123 123
                     <td data-th="<?php
124
-                                    echo apply_filters(
125
-                                        'FHEE__ticket_selector_chart_template__ticket_details_total_price',
126
-                                        esc_html__('Total', 'event_espresso')
127
-                                    ); ?>" class="jst-rght small-text">
124
+									echo apply_filters(
125
+										'FHEE__ticket_selector_chart_template__ticket_details_total_price',
126
+										esc_html__('Total', 'event_espresso')
127
+									); ?>" class="jst-rght small-text">
128 128
                         <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
129 129
                 </tr>
130 130
                 </tbody>
Please login to merge, or discard this patch.
espresso.php 1 patch
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -38,103 +38,103 @@
 block discarded – undo
38 38
  * @since           4.0
39 39
  */
40 40
 if (function_exists('espresso_version')) {
41
-    if (! function_exists('espresso_duplicate_plugin_error')) {
42
-        /**
43
-         *    espresso_duplicate_plugin_error
44
-         *    displays if more than one version of EE is activated at the same time
45
-         */
46
-        function espresso_duplicate_plugin_error()
47
-        {
48
-            ?>
41
+	if (! function_exists('espresso_duplicate_plugin_error')) {
42
+		/**
43
+		 *    espresso_duplicate_plugin_error
44
+		 *    displays if more than one version of EE is activated at the same time
45
+		 */
46
+		function espresso_duplicate_plugin_error()
47
+		{
48
+			?>
49 49
             <div class="error">
50 50
                 <p>
51 51
                     <?php
52
-                    echo esc_html__(
53
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
54
-                        'event_espresso'
55
-                    ); ?>
52
+					echo esc_html__(
53
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
54
+						'event_espresso'
55
+					); ?>
56 56
                 </p>
57 57
             </div>
58 58
             <?php
59
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
60
-        }
61
-    }
62
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
59
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
60
+		}
61
+	}
62
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
63 63
 } else {
64
-    define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
65
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
66
-        /**
67
-         * espresso_minimum_php_version_error
68
-         *
69
-         * @return void
70
-         */
71
-        function espresso_minimum_php_version_error()
72
-        {
73
-            ?>
64
+	define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
65
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
66
+		/**
67
+		 * espresso_minimum_php_version_error
68
+		 *
69
+		 * @return void
70
+		 */
71
+		function espresso_minimum_php_version_error()
72
+		{
73
+			?>
74 74
             <div class="error">
75 75
                 <p>
76 76
                     <?php
77
-                    printf(
78
-                        esc_html__(
79
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
80
-                            'event_espresso'
81
-                        ),
82
-                        EE_MIN_PHP_VER_REQUIRED,
83
-                        PHP_VERSION,
84
-                        '<br/>',
85
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
86
-                    );
87
-                    ?>
77
+					printf(
78
+						esc_html__(
79
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
80
+							'event_espresso'
81
+						),
82
+						EE_MIN_PHP_VER_REQUIRED,
83
+						PHP_VERSION,
84
+						'<br/>',
85
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
86
+					);
87
+					?>
88 88
                 </p>
89 89
             </div>
90 90
             <?php
91
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
92
-        }
91
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
92
+		}
93 93
 
94
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
95
-    } else {
96
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
97
-        /**
98
-         * espresso_version
99
-         * Returns the plugin version
100
-         *
101
-         * @return string
102
-         */
103
-        function espresso_version()
104
-        {
105
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.82.rc.036');
106
-        }
94
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
95
+	} else {
96
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
97
+		/**
98
+		 * espresso_version
99
+		 * Returns the plugin version
100
+		 *
101
+		 * @return string
102
+		 */
103
+		function espresso_version()
104
+		{
105
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.82.rc.036');
106
+		}
107 107
 
108
-        /**
109
-         * espresso_plugin_activation
110
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
111
-         */
112
-        function espresso_plugin_activation()
113
-        {
114
-            update_option('ee_espresso_activation', true);
115
-        }
108
+		/**
109
+		 * espresso_plugin_activation
110
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
111
+		 */
112
+		function espresso_plugin_activation()
113
+		{
114
+			update_option('ee_espresso_activation', true);
115
+		}
116 116
 
117
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
117
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
118 118
 
119
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
120
-        bootstrap_espresso();
121
-    }
119
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
120
+		bootstrap_espresso();
121
+	}
122 122
 }
123 123
 if (! function_exists('espresso_deactivate_plugin')) {
124
-    /**
125
-     *    deactivate_plugin
126
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
127
-     *
128
-     * @access public
129
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
130
-     * @return    void
131
-     */
132
-    function espresso_deactivate_plugin($plugin_basename = '')
133
-    {
134
-        if (! function_exists('deactivate_plugins')) {
135
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
136
-        }
137
-        unset($_GET['activate'], $_REQUEST['activate']);
138
-        deactivate_plugins($plugin_basename);
139
-    }
124
+	/**
125
+	 *    deactivate_plugin
126
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
127
+	 *
128
+	 * @access public
129
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
130
+	 * @return    void
131
+	 */
132
+	function espresso_deactivate_plugin($plugin_basename = '')
133
+	{
134
+		if (! function_exists('deactivate_plugins')) {
135
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
136
+		}
137
+		unset($_GET['activate'], $_REQUEST['activate']);
138
+		deactivate_plugins($plugin_basename);
139
+	}
140 140
 }
Please login to merge, or discard this patch.