Passed
Push — master ( 1fbace...736448 )
by Brian
06:40 queued 01:38
created
includes/admin/class-wpinv-admin-menus.php 1 patch
Spacing   +90 added lines, -90 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Setup menus in WP admin.
4 4
  */
5 5
 
6
-defined( 'ABSPATH' ) || exit;
6
+defined('ABSPATH') || exit;
7 7
 
8 8
 /**
9 9
  * WC_Admin_Menus Class.
@@ -13,40 +13,40 @@  discard block
 block discarded – undo
13 13
      * Hook in tabs.
14 14
      */
15 15
     public function __construct() {
16
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
17
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 99 );
18
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
19
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
16
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
17
+        add_action('admin_menu', array($this, 'add_addons_menu'), 99);
18
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
19
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
20 20
     }
21 21
 
22 22
     public function admin_menu() {
23 23
         global $menu, $submenu;
24 24
 
25
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
25
+        if (!wpinv_current_user_can_manage_invoicing()) {
26 26
             return;
27 27
         }
28 28
 
29
-        $capability = apply_filters( 'invoicing_capability', wpinv_get_capability() );
29
+        $capability = apply_filters('invoicing_capability', wpinv_get_capability());
30 30
 
31
-        if ( wpinv_current_user_can_manage_invoicing() ) {
32
-            $menu[] = array( '', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv' );
31
+        if (wpinv_current_user_can_manage_invoicing()) {
32
+            $menu[] = array('', 'read', 'separator-wpinv', '', 'wp-menu-separator wpinv');
33 33
 
34 34
             // Allow users with 'manage_invocing' capability to create new invoices
35
-            $submenu['post-new.php?post_type=wpi_invoice'][]  = array( '', '', 'post-new.php?post_type=wpi_invoice', '' );
36
-            $submenu['post-new.php?post_type=wpi_item'][]     = array( '', '', 'post-new.php?post_type=wpi_item', '' );
37
-            $submenu['post-new.php?post_type=wpi_discount'][] = array( '', '', 'post-new.php?post_type=wpi_discount', '' );
35
+            $submenu['post-new.php?post_type=wpi_invoice'][]  = array('', '', 'post-new.php?post_type=wpi_invoice', '');
36
+            $submenu['post-new.php?post_type=wpi_item'][]     = array('', '', 'post-new.php?post_type=wpi_item', '');
37
+            $submenu['post-new.php?post_type=wpi_discount'][] = array('', '', 'post-new.php?post_type=wpi_discount', '');
38 38
 
39 39
         }
40 40
 
41
-        $wpi_invoice = get_post_type_object( 'wpi_invoice' );
41
+        $wpi_invoice = get_post_type_object('wpi_invoice');
42 42
 
43
-        add_menu_page( __( 'Invoicing', 'invoicing' ), __( 'Invoicing', 'invoicing' ), $capability, 'wpinv', null, $wpi_invoice->menu_icon, '54.123460' );
43
+        add_menu_page(__('Invoicing', 'invoicing'), __('Invoicing', 'invoicing'), $capability, 'wpinv', null, $wpi_invoice->menu_icon, '54.123460');
44 44
 
45
-        add_submenu_page( 'wpinv', __( 'Invoice Settings', 'invoicing' ), __( 'Settings', 'invoicing' ), $capability, 'wpinv-settings', array( $this, 'options_page' ));
45
+        add_submenu_page('wpinv', __('Invoice Settings', 'invoicing'), __('Settings', 'invoicing'), $capability, 'wpinv-settings', array($this, 'options_page'));
46 46
     }
47 47
 
48
-    public function add_addons_menu(){
49
-        if ( !apply_filters( 'wpi_show_addons_page', true ) ) {
48
+    public function add_addons_menu() {
49
+        if (!apply_filters('wpi_show_addons_page', true)) {
50 50
             return;
51 51
         }
52 52
 
@@ -56,78 +56,78 @@  discard block
 block discarded – undo
56 56
             __('Extensions', 'invoicing'),
57 57
             'manage_options',
58 58
             'wpi-addons',
59
-            array( $this, 'addons_page' )
59
+            array($this, 'addons_page')
60 60
         );
61 61
     }
62 62
 
63
-    public function addons_page(){
63
+    public function addons_page() {
64 64
         $addon_obj = new WPInv_Admin_Addons();
65 65
         $addon_obj->output();
66 66
     }
67 67
 
68 68
     function options_page() {
69
-        $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
69
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
70 70
 
71
-        if ( $page !== 'wpinv-settings' ) {
71
+        if ($page !== 'wpinv-settings') {
72 72
             return;
73 73
         }
74 74
 
75 75
         $settings_tabs = wpinv_get_settings_tabs();
76 76
         $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
77
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
78
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
77
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
78
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
79 79
         $key           = 'main';
80 80
 
81
-        if ( is_array( $sections ) ) {
82
-            $key = key( $sections );
81
+        if (is_array($sections)) {
82
+            $key = key($sections);
83 83
         }
84 84
 
85
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
86
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
85
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
86
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
87 87
         ob_start();
88 88
         ?>
89 89
         <div class="wrap">
90 90
             <h1 class="nav-tab-wrapper">
91 91
                 <?php
92
-                foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
93
-                    $tab_url = add_query_arg( array(
92
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
93
+                    $tab_url = add_query_arg(array(
94 94
                         'settings-updated' => false,
95 95
                         'tab' => $tab_id,
96
-                    ) );
96
+                    ));
97 97
 
98 98
                     // Remove the section from the tabs so we always end up at the main section
99
-                    $tab_url = remove_query_arg( 'section', $tab_url );
100
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
99
+                    $tab_url = remove_query_arg('section', $tab_url);
100
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
101 101
 
102 102
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
103 103
 
104
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
105
-                    echo esc_html( $tab_name );
104
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
105
+                    echo esc_html($tab_name);
106 106
                     echo '</a>';
107 107
                 }
108 108
                 ?>
109 109
             </h1>
110 110
             <?php
111
-            $number_of_sections = count( $sections );
111
+            $number_of_sections = count($sections);
112 112
             $number = 0;
113
-            if ( $number_of_sections > 1 ) {
113
+            if ($number_of_sections > 1) {
114 114
                 echo '<div><ul class="subsubsub">';
115
-                foreach( $sections as $section_id => $section_name ) {
115
+                foreach ($sections as $section_id => $section_name) {
116 116
                     echo '<li>';
117 117
                     $number++;
118
-                    $tab_url = add_query_arg( array(
118
+                    $tab_url = add_query_arg(array(
119 119
                         'settings-updated' => false,
120 120
                         'tab' => $active_tab,
121 121
                         'section' => $section_id
122
-                    ) );
123
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
122
+                    ));
123
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
124 124
                     $class = '';
125
-                    if ( $section == $section_id ) {
125
+                    if ($section == $section_id) {
126 126
                         $class = 'current';
127 127
                     }
128
-                    echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
128
+                    echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
129 129
 
130
-                    if ( $number != $number_of_sections ) {
130
+                    if ($number != $number_of_sections) {
131 131
                         echo ' | ';
132 132
                     }
133 133
                     echo '</li>';
@@ -139,19 +139,19 @@  discard block
 block discarded – undo
139 139
                 <form method="post" action="options.php">
140 140
                     <table class="form-table">
141 141
                         <?php
142
-                        settings_fields( 'wpinv_settings' );
142
+                        settings_fields('wpinv_settings');
143 143
 
144
-                        if ( 'main' === $section ) {
145
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
144
+                        if ('main' === $section) {
145
+                            do_action('wpinv_settings_tab_top', $active_tab);
146 146
                         }
147 147
 
148
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
149
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
150
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
148
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
149
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
150
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
151 151
 
152 152
                         // For backwards compatibility
153
-                        if ( 'main' === $section ) {
154
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
153
+                        if ('main' === $section) {
154
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
155 155
                         }
156 156
                         ?>
157 157
                     </table>
@@ -165,18 +165,18 @@  discard block
 block discarded – undo
165 165
     }
166 166
 
167 167
     public function remove_admin_submenus() {
168
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
168
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
169 169
     }
170 170
 
171
-    public function add_nav_menu_meta_boxes(){
172
-        add_meta_box( 'wpinv_endpoints_nav_link', __( 'Invoicing Pages', 'invoicing' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
171
+    public function add_nav_menu_meta_boxes() {
172
+        add_meta_box('wpinv_endpoints_nav_link', __('Invoicing Pages', 'invoicing'), array($this, 'nav_menu_links'), 'nav-menus', 'side', 'low');
173 173
     }
174 174
 
175
-    public function nav_menu_links(){
175
+    public function nav_menu_links() {
176 176
         $endpoints = $this->get_menu_items();
177 177
         ?>
178 178
         <div id="invoicing-endpoints" class="posttypediv">
179
-        <?php if(!empty($endpoints['pages'])){ ?>
179
+        <?php if (!empty($endpoints['pages'])) { ?>
180 180
             <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
181 181
                 <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
182 182
                     <?php
@@ -188,29 +188,29 @@  discard block
 block discarded – undo
188 188
         <?php } ?>
189 189
         <p class="button-controls">
190 190
         <span class="list-controls">
191
-            <a href="<?php echo admin_url( 'nav-menus.php?page-tab=all&selectall=1#invoicing-endpoints' ); ?>" class="select-all"><?php _e( 'Select all', 'invoicing' ); ?></a>
191
+            <a href="<?php echo admin_url('nav-menus.php?page-tab=all&selectall=1#invoicing-endpoints'); ?>" class="select-all"><?php _e('Select all', 'invoicing'); ?></a>
192 192
         </span>
193 193
             <span class="add-to-menu">
194
-            <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-post-type-menu-item" id="submit-invoicing-endpoints">
194
+            <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-post-type-menu-item" id="submit-invoicing-endpoints">
195 195
             <span class="spinner"></span>
196 196
         </span>
197 197
         </p>
198 198
         <?php
199 199
     }
200 200
 
201
-    public function get_menu_items(){
201
+    public function get_menu_items() {
202 202
         $items = array();
203 203
 
204
-        $wpinv_history_page_id = (int)wpinv_get_option( 'invoice_history_page' );
205
-        if($wpinv_history_page_id > 0){
204
+        $wpinv_history_page_id = (int) wpinv_get_option('invoice_history_page');
205
+        if ($wpinv_history_page_id > 0) {
206 206
             $item = new stdClass();
207 207
             $item->object_id = $wpinv_history_page_id;
208 208
             $item->db_id = 0;
209
-            $item->object =  'page';
209
+            $item->object = 'page';
210 210
             $item->menu_item_parent = 0;
211 211
             $item->type = 'post_type';
212
-            $item->title = __('Invoice History Page','invoicing');
213
-            $item->url = get_permalink( $wpinv_history_page_id );
212
+            $item->title = __('Invoice History Page', 'invoicing');
213
+            $item->url = get_permalink($wpinv_history_page_id);
214 214
             $item->target = '';
215 215
             $item->attr_title = '';
216 216
             $item->classes = array('wpinv-menu-item');
@@ -219,16 +219,16 @@  discard block
 block discarded – undo
219 219
             $items['pages'][] = $item;
220 220
         }
221 221
 
222
-        $wpinv_sub_history_page_id = (int)wpinv_get_option( 'invoice_subscription_page' );
223
-        if($wpinv_sub_history_page_id > 0){
222
+        $wpinv_sub_history_page_id = (int) wpinv_get_option('invoice_subscription_page');
223
+        if ($wpinv_sub_history_page_id > 0) {
224 224
             $item = new stdClass();
225 225
             $item->object_id = $wpinv_sub_history_page_id;
226 226
             $item->db_id = 0;
227
-            $item->object =  'page';
227
+            $item->object = 'page';
228 228
             $item->menu_item_parent = 0;
229 229
             $item->type = 'post_type';
230
-            $item->title = __('Invoice Subscriptions Page','invoicing');
231
-            $item->url = get_permalink( $wpinv_sub_history_page_id );
230
+            $item->title = __('Invoice Subscriptions Page', 'invoicing');
231
+            $item->url = get_permalink($wpinv_sub_history_page_id);
232 232
             $item->target = '';
233 233
             $item->attr_title = '';
234 234
             $item->classes = array('wpinv-menu-item');
@@ -237,16 +237,16 @@  discard block
 block discarded – undo
237 237
             $items['pages'][] = $item;
238 238
         }
239 239
 
240
-        $wpinv_checkout_page_id = (int)wpinv_get_option( 'checkout_page' );
241
-        if($wpinv_checkout_page_id > 0){
240
+        $wpinv_checkout_page_id = (int) wpinv_get_option('checkout_page');
241
+        if ($wpinv_checkout_page_id > 0) {
242 242
             $item = new stdClass();
243 243
             $item->object_id = $wpinv_checkout_page_id;
244 244
             $item->db_id = 0;
245
-            $item->object =  'page';
245
+            $item->object = 'page';
246 246
             $item->menu_item_parent = 0;
247 247
             $item->type = 'post_type';
248
-            $item->title = __('Checkout Page','invoicing');
249
-            $item->url = get_permalink( $wpinv_checkout_page_id );
248
+            $item->title = __('Checkout Page', 'invoicing');
249
+            $item->url = get_permalink($wpinv_checkout_page_id);
250 250
             $item->target = '';
251 251
             $item->attr_title = '';
252 252
             $item->classes = array('wpinv-menu-item');
@@ -255,16 +255,16 @@  discard block
 block discarded – undo
255 255
             $items['pages'][] = $item;
256 256
         }
257 257
 
258
-        $wpinv_tandc_page_id = (int)wpinv_get_option( 'tandc_page' );
259
-        if($wpinv_tandc_page_id > 0){
258
+        $wpinv_tandc_page_id = (int) wpinv_get_option('tandc_page');
259
+        if ($wpinv_tandc_page_id > 0) {
260 260
             $item = new stdClass();
261 261
             $item->object_id = $wpinv_tandc_page_id;
262 262
             $item->db_id = 0;
263
-            $item->object =  'page';
263
+            $item->object = 'page';
264 264
             $item->menu_item_parent = 0;
265 265
             $item->type = 'post_type';
266
-            $item->title = __('Terms & Conditions','invoicing');
267
-            $item->url = get_permalink( $wpinv_tandc_page_id );
266
+            $item->title = __('Terms & Conditions', 'invoicing');
267
+            $item->url = get_permalink($wpinv_tandc_page_id);
268 268
             $item->target = '';
269 269
             $item->attr_title = '';
270 270
             $item->classes = array('wpinv-menu-item');
@@ -273,16 +273,16 @@  discard block
 block discarded – undo
273 273
             $items['pages'][] = $item;
274 274
         }
275 275
 
276
-        $wpinv_success_page_id = (int)wpinv_get_option( 'success_page' );
277
-        if($wpinv_success_page_id > 0){
276
+        $wpinv_success_page_id = (int) wpinv_get_option('success_page');
277
+        if ($wpinv_success_page_id > 0) {
278 278
             $item = new stdClass();
279 279
             $item->object_id = $wpinv_success_page_id;
280 280
             $item->db_id = 0;
281
-            $item->object =  'page';
281
+            $item->object = 'page';
282 282
             $item->menu_item_parent = 0;
283 283
             $item->type = 'post_type';
284
-            $item->title = __('Success Page','invoicing');
285
-            $item->url = get_permalink( $wpinv_success_page_id );
284
+            $item->title = __('Success Page', 'invoicing');
285
+            $item->url = get_permalink($wpinv_success_page_id);
286 286
             $item->target = '';
287 287
             $item->attr_title = '';
288 288
             $item->classes = array('wpinv-menu-item');
@@ -291,16 +291,16 @@  discard block
 block discarded – undo
291 291
             $items['pages'][] = $item;
292 292
         }
293 293
 
294
-        $wpinv_failure_page_id = (int)wpinv_get_option( 'failure_page' );
295
-        if($wpinv_failure_page_id > 0){
294
+        $wpinv_failure_page_id = (int) wpinv_get_option('failure_page');
295
+        if ($wpinv_failure_page_id > 0) {
296 296
             $item = new stdClass();
297 297
             $item->object_id = $wpinv_failure_page_id;
298 298
             $item->db_id = 0;
299
-            $item->object =  'page';
299
+            $item->object = 'page';
300 300
             $item->menu_item_parent = 0;
301 301
             $item->type = 'post_type';
302
-            $item->title = __('Failed Transaction Page','invoicing');
303
-            $item->url = get_permalink( $wpinv_failure_page_id );
302
+            $item->title = __('Failed Transaction Page', 'invoicing');
303
+            $item->url = get_permalink($wpinv_failure_page_id);
304 304
             $item->target = '';
305 305
             $item->attr_title = '';
306 306
             $item->classes = array('wpinv-menu-item');
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
             $items['pages'][] = $item;
310 310
         }
311 311
 
312
-        return apply_filters( 'wpinv_menu_items', $items );
312
+        return apply_filters('wpinv_menu_items', $items);
313 313
     }
314 314
 
315 315
 }
Please login to merge, or discard this patch.
includes/class-wpinv-subscriptions.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // Exit if accessed directly.
3
-if (!defined( 'ABSPATH' ) ) exit;
3
+if (!defined('ABSPATH')) exit;
4 4
 
5 5
 function wpinv_subscription_init() {
6 6
     return WPInv_Subscriptions::instance();
7 7
 }
8
-add_action( 'plugins_loaded', 'wpinv_subscription_init', 100 );
8
+add_action('plugins_loaded', 'wpinv_subscription_init', 100);
9 9
 
10 10
 /**
11 11
  * WPInv_Subscriptions Class.
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
      * Main WPInv_Subscriptions Instance
21 21
      */
22 22
     public static function instance() {
23
-        if ( ! isset( self::$instance ) ) {
23
+        if (!isset(self::$instance)) {
24 24
             self::$instance = new WPInv_Subscriptions;
25 25
 
26 26
             self::$instance->init();
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      *
35 35
      * @since 1.0.0
36 36
      */
37
-    private function __construct(){
37
+    private function __construct() {
38 38
 
39 39
     }
40 40
 
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
     private function setup_constants() {
64 64
 
65 65
         // Make sure CAL_GREGORIAN is defined.
66
-        if ( ! defined( 'CAL_GREGORIAN' ) ) {
67
-            define( 'CAL_GREGORIAN', 1 );
66
+        if (!defined('CAL_GREGORIAN')) {
67
+            define('CAL_GREGORIAN', 1);
68 68
         }
69 69
     }
70 70
 
@@ -76,13 +76,13 @@  discard block
 block discarded – undo
76 76
      */
77 77
     private function actions() {
78 78
 
79
-        add_action( 'admin_menu', array( $this, 'wpinv_subscriptions_list' ), 10 );
80
-        add_action( 'admin_notices', array( $this, 'notices' ) );
81
-        add_action( 'init', array( $this, 'wpinv_post_actions' ) );
82
-        add_action( 'init', array( $this, 'wpinv_get_actions' ) );
83
-        add_action( 'wpinv_cancel_subscription', array( $this, 'wpinv_process_cancellation' ) );
84
-        add_action( 'wpinv_checkout_before_send_to_gateway', array( $this, 'wpinv_checkout_add_subscription' ), -999, 2 );
85
-        add_action( 'wpinv_subscriptions_front_notices', array( $this, 'notices' ) );
79
+        add_action('admin_menu', array($this, 'wpinv_subscriptions_list'), 10);
80
+        add_action('admin_notices', array($this, 'notices'));
81
+        add_action('init', array($this, 'wpinv_post_actions'));
82
+        add_action('init', array($this, 'wpinv_get_actions'));
83
+        add_action('wpinv_cancel_subscription', array($this, 'wpinv_process_cancellation'));
84
+        add_action('wpinv_checkout_before_send_to_gateway', array($this, 'wpinv_checkout_add_subscription'), -999, 2);
85
+        add_action('wpinv_subscriptions_front_notices', array($this, 'notices'));
86 86
     }
87 87
 
88 88
     /**
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
     public function wpinv_subscriptions_list() {
105 105
         add_submenu_page(
106 106
             'wpinv',
107
-            __( 'Subscriptions', 'invoicing' ),
108
-            __( 'Subscriptions', 'invoicing' ),
107
+            __('Subscriptions', 'invoicing'),
108
+            __('Subscriptions', 'invoicing'),
109 109
             wpinv_get_capability(),
110 110
             'wpinv-subscriptions',
111 111
             'wpinv_subscriptions_page'
@@ -114,37 +114,37 @@  discard block
 block discarded – undo
114 114
 
115 115
     public function notices() {
116 116
 
117
-        if( empty( $_GET['wpinv-message'] ) ) {
117
+        if (empty($_GET['wpinv-message'])) {
118 118
             return;
119 119
         }
120 120
 
121 121
         $type    = 'updated';
122 122
         $message = '';
123 123
 
124
-        switch( strtolower( $_GET['wpinv-message'] ) ) {
124
+        switch (strtolower($_GET['wpinv-message'])) {
125 125
 
126 126
             case 'updated' :
127 127
 
128
-                $message = __( 'Subscription updated successfully.', 'invoicing' );
128
+                $message = __('Subscription updated successfully.', 'invoicing');
129 129
 
130 130
                 break;
131 131
 
132 132
             case 'deleted' :
133 133
 
134
-                $message = __( 'Subscription deleted successfully.', 'invoicing' );
134
+                $message = __('Subscription deleted successfully.', 'invoicing');
135 135
 
136 136
                 break;
137 137
 
138 138
             case 'cancelled' :
139 139
 
140
-                $message = __( 'Subscription cancelled successfully.', 'invoicing' );
140
+                $message = __('Subscription cancelled successfully.', 'invoicing');
141 141
 
142 142
                 break;
143 143
 
144 144
         }
145 145
 
146
-        if ( ! empty( $message ) ) {
147
-            echo '<div class="' . esc_attr( $type ) . '"><p>' . $message . '</p></div>';
146
+        if (!empty($message)) {
147
+            echo '<div class="' . esc_attr($type) . '"><p>' . $message . '</p></div>';
148 148
         }
149 149
 
150 150
     }
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
      * @return void
158 158
      */
159 159
     function wpinv_get_actions() {
160
-        if ( isset( $_GET['wpinv_action'] ) ) {
161
-            do_action( 'wpinv_' . $_GET['wpinv_action'], $_GET );
160
+        if (isset($_GET['wpinv_action'])) {
161
+            do_action('wpinv_' . $_GET['wpinv_action'], $_GET);
162 162
         }
163 163
     }
164 164
 
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
      * @return void
171 171
      */
172 172
     function wpinv_post_actions() {
173
-        if ( isset( $_POST['wpinv_action'] ) ) {
174
-            do_action( 'wpinv_' . $_POST['wpinv_action'], $_POST );
173
+        if (isset($_POST['wpinv_action'])) {
174
+            do_action('wpinv_' . $_POST['wpinv_action'], $_POST);
175 175
         }
176 176
     }
177 177
 
@@ -182,24 +182,24 @@  discard block
 block discarded – undo
182 182
      * @param int $frequency_count The frequency of the period.
183 183
      * @return mixed|string|void
184 184
      */
185
-    public static function wpinv_get_pretty_subscription_frequency( $period, $frequency_count = 1) {
185
+    public static function wpinv_get_pretty_subscription_frequency($period, $frequency_count = 1) {
186 186
         $frequency = '';
187 187
         //Format period details
188
-        switch ( $period ) {
188
+        switch ($period) {
189 189
             case 'day' :
190
-                $frequency = sprintf( _n('%d Day', '%d Days', $frequency_count, 'invoicing'), $frequency_count);
190
+                $frequency = sprintf(_n('%d Day', '%d Days', $frequency_count, 'invoicing'), $frequency_count);
191 191
                 break;
192 192
             case 'week' :
193
-                $frequency = sprintf( _n('%d Week', '%d Weeks', $frequency_count, 'invoicing'), $frequency_count);
193
+                $frequency = sprintf(_n('%d Week', '%d Weeks', $frequency_count, 'invoicing'), $frequency_count);
194 194
                 break;
195 195
             case 'month' :
196
-                $frequency = sprintf( _n('%d Month', '%d Months', $frequency_count, 'invoicing'), $frequency_count);
196
+                $frequency = sprintf(_n('%d Month', '%d Months', $frequency_count, 'invoicing'), $frequency_count);
197 197
                 break;
198 198
             case 'year' :
199
-                $frequency = sprintf( _n('%d Year', '%d Years', $frequency_count, 'invoicing'), $frequency_count);
199
+                $frequency = sprintf(_n('%d Year', '%d Years', $frequency_count, 'invoicing'), $frequency_count);
200 200
                 break;
201 201
             default :
202
-                $frequency = apply_filters( 'wpinv_recurring_subscription_frequency', $frequency, $period, $frequency_count );
202
+                $frequency = apply_filters('wpinv_recurring_subscription_frequency', $frequency, $period, $frequency_count);
203 203
                 break;
204 204
         }
205 205
 
@@ -214,50 +214,50 @@  discard block
 block discarded – undo
214 214
      * @since       1.0.0
215 215
      * @return      void
216 216
      */
217
-    public function wpinv_process_cancellation( $data ) {
217
+    public function wpinv_process_cancellation($data) {
218 218
 
219 219
 
220
-        if( empty( $data['sub_id'] ) ) {
220
+        if (empty($data['sub_id'])) {
221 221
             return;
222 222
         }
223 223
 
224
-        if( ! is_user_logged_in() ) {
224
+        if (!is_user_logged_in()) {
225 225
             return;
226 226
         }
227 227
 
228
-        if( ! wp_verify_nonce( $data['_wpnonce'], 'wpinv-recurring-cancel' ) ) {
229
-            wp_die( __( 'Error', 'invoicing' ), __( 'Nonce verification failed', 'invoicing' ), array( 'response' => 403 ) );
228
+        if (!wp_verify_nonce($data['_wpnonce'], 'wpinv-recurring-cancel')) {
229
+            wp_die(__('Error', 'invoicing'), __('Nonce verification failed', 'invoicing'), array('response' => 403));
230 230
         }
231 231
 
232
-        $data['sub_id'] = absint( $data['sub_id'] );
233
-        $subscription   = new WPInv_Subscription( $data['sub_id'] );
232
+        $data['sub_id'] = absint($data['sub_id']);
233
+        $subscription   = new WPInv_Subscription($data['sub_id']);
234 234
 
235
-        if( ! $subscription->can_cancel() ) {
236
-            wp_die( __( 'Error', 'invoicing' ), __( 'This subscription cannot be cancelled', 'invoicing' ), array( 'response' => 403 ) );
235
+        if (!$subscription->can_cancel()) {
236
+            wp_die(__('Error', 'invoicing'), __('This subscription cannot be cancelled', 'invoicing'), array('response' => 403));
237 237
         }
238 238
 
239 239
         try {
240 240
 
241
-            do_action( 'wpinv_recurring_cancel_' . $subscription->gateway . '_subscription', $subscription, true );
241
+            do_action('wpinv_recurring_cancel_' . $subscription->gateway . '_subscription', $subscription, true);
242 242
 
243 243
             $subscription->cancel();
244 244
 
245
-            if( is_admin() ) {
245
+            if (is_admin()) {
246 246
 
247
-                wp_redirect( admin_url( 'admin.php?page=wpinv-subscriptions&wpinv-message=cancelled&id=' . $subscription->id ) );
247
+                wp_redirect(admin_url('admin.php?page=wpinv-subscriptions&wpinv-message=cancelled&id=' . $subscription->id));
248 248
                 exit;
249 249
 
250 250
             } else {
251 251
 
252
-                $redirect = remove_query_arg( array( '_wpnonce', 'wpinv_action', 'sub_id' ), add_query_arg( array( 'wpinv-message' => 'cancelled' ) ) );
253
-                $redirect = apply_filters( 'wpinv_recurring_cancellation_redirect', $redirect, $subscription );
254
-                wp_safe_redirect( $redirect );
252
+                $redirect = remove_query_arg(array('_wpnonce', 'wpinv_action', 'sub_id'), add_query_arg(array('wpinv-message' => 'cancelled')));
253
+                $redirect = apply_filters('wpinv_recurring_cancellation_redirect', $redirect, $subscription);
254
+                wp_safe_redirect($redirect);
255 255
                 exit;
256 256
 
257 257
             }
258 258
 
259
-        } catch ( Exception $e ) {
260
-            wp_die( __( 'Error', 'invoicing' ), $e->getMessage(), array( 'response' => 403 ) );
259
+        } catch (Exception $e) {
260
+            wp_die(__('Error', 'invoicing'), $e->getMessage(), array('response' => 403));
261 261
         }
262 262
 
263 263
     }
@@ -269,35 +269,35 @@  discard block
 block discarded – undo
269 269
      * @since       1.0.0
270 270
      * @return      void
271 271
      */
272
-    public function wpinv_checkout_add_subscription( $invoice, $invoice_data ) {
273
-        if ( ! ( ! empty( $invoice->ID ) && $invoice->is_recurring() ) ) {
272
+    public function wpinv_checkout_add_subscription($invoice, $invoice_data) {
273
+        if (!(!empty($invoice->ID) && $invoice->is_recurring())) {
274 274
             return;
275 275
         }
276 276
         
277
-        $item               = $invoice->get_recurring( true );
278
-        if ( empty( $item ) ) {
277
+        $item = $invoice->get_recurring(true);
278
+        if (empty($item)) {
279 279
             return;
280 280
         }
281 281
 
282
-        $invoice_date       = $invoice->get_invoice_date( false );
282
+        $invoice_date       = $invoice->get_invoice_date(false);
283 283
         $status             = 'pending';
284 284
 
285
-        $period             = $item->get_recurring_period( true );
285
+        $period             = $item->get_recurring_period(true);
286 286
         $interval           = $item->get_recurring_interval();
287
-        $bill_times         = (int)$item->get_recurring_limit();
287
+        $bill_times         = (int) $item->get_recurring_limit();
288 288
         $add_period         = $interval . ' ' . $period;
289 289
         $trial_period       = '';
290 290
 
291
-        if ( $invoice->is_free_trial() ) {
291
+        if ($invoice->is_free_trial()) {
292 292
             $status         = 'trialling';
293
-            $trial_period   = $item->get_trial_period( true );
293
+            $trial_period   = $item->get_trial_period(true);
294 294
             $free_interval  = $item->get_trial_interval();
295 295
             $trial_period   = $free_interval . ' ' . $trial_period;
296 296
 
297 297
             $add_period     = $trial_period;
298 298
         }
299 299
 
300
-        $expiration         = date_i18n( 'Y-m-d H:i:s', strtotime( '+' . $add_period  . ' 23:59:59', strtotime( $invoice_date ) ) );
300
+        $expiration         = date_i18n('Y-m-d H:i:s', strtotime('+' . $add_period . ' 23:59:59', strtotime($invoice_date)));
301 301
 
302 302
         $args = array(
303 303
             'product_id'        => $item->ID,
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
             'frequency'         => $interval,
308 308
             'period'            => $period,
309 309
             'initial_amount'    => $invoice->get_total(),
310
-            'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
310
+            'recurring_amount'  => $invoice->get_recurring_details('total'),
311 311
             'bill_times'        => $bill_times,
312 312
             'created'           => $invoice_date,
313 313
             'expiration'        => $expiration,
@@ -316,11 +316,11 @@  discard block
 block discarded – undo
316 316
             'transaction_id'    => '',
317 317
         );
318 318
 
319
-        $subscription = wpinv_get_subscription( $invoice );
319
+        $subscription = wpinv_get_subscription($invoice);
320 320
 
321
-        if ( empty( $subscription ) ) {
321
+        if (empty($subscription)) {
322 322
             $subscription = new WPInv_Subscription();
323
-            $subscription->create( $args );
323
+            $subscription->create($args);
324 324
         }
325 325
         
326 326
         return $subscription;
Please login to merge, or discard this patch.
includes/wpinv-address-functions.php 1 patch
Spacing   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@  discard block
 block discarded – undo
7 7
  */
8 8
  
9 9
 // MUST have WordPress.
10
-if ( !defined( 'WPINC' ) ) {
11
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
10
+if (!defined('WPINC')) {
11
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
12 12
 }
13 13
 
14 14
 
15 15
 function wpinv_get_default_country() {
16
-	$country = wpinv_get_option( 'default_country', 'UK' );
16
+	$country = wpinv_get_option('default_country', 'UK');
17 17
 
18
-	return apply_filters( 'wpinv_default_country', $country );
18
+	return apply_filters('wpinv_default_country', $country);
19 19
 }
20 20
 
21 21
 /**
@@ -24,66 +24,66 @@  discard block
 block discarded – undo
24 24
  * @param string $country The country code to sanitize
25 25
  * @return array
26 26
  */
27
-function wpinv_sanitize_country( $country ) {
27
+function wpinv_sanitize_country($country) {
28 28
 
29 29
 	// Enure the country is specified
30
-    if ( empty( $country ) ) {
30
+    if (empty($country)) {
31 31
         $country = wpinv_get_default_country();
32 32
     }
33
-    return trim( wpinv_utf8_strtoupper( $country ) );
33
+    return trim(wpinv_utf8_strtoupper($country));
34 34
 
35 35
 }
36 36
 
37
-function wpinv_is_base_country( $country ) {
37
+function wpinv_is_base_country($country) {
38 38
     $base_country = wpinv_get_default_country();
39 39
     
40
-    if ( $base_country === 'UK' ) {
40
+    if ($base_country === 'UK') {
41 41
         $base_country = 'GB';
42 42
     }
43
-    if ( $country == 'UK' ) {
43
+    if ($country == 'UK') {
44 44
         $country = 'GB';
45 45
     }
46 46
 
47
-    return ( $country && $country === $base_country ) ? true : false;
47
+    return ($country && $country === $base_country) ? true : false;
48 48
 }
49 49
 
50
-function wpinv_country_name( $country_code = '' ) { 
50
+function wpinv_country_name($country_code = '') { 
51 51
     $countries = wpinv_get_country_list();
52 52
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
53
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
53
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
54 54
 
55
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
55
+    return apply_filters('wpinv_country_name', $country, $country_code);
56 56
 }
57 57
 
58 58
 function wpinv_get_default_state() {
59
-	$state = wpinv_get_option( 'default_state', false );
59
+	$state = wpinv_get_option('default_state', false);
60 60
 
61
-	return apply_filters( 'wpinv_default_state', $state );
61
+	return apply_filters('wpinv_default_state', $state);
62 62
 }
63 63
 
64
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
64
+function wpinv_state_name($state_code = '', $country_code = '') {
65 65
     $state = $state_code;
66 66
     
67
-    if ( !empty( $country_code ) ) {
68
-        $states = wpinv_get_country_states( $country_code );
67
+    if (!empty($country_code)) {
68
+        $states = wpinv_get_country_states($country_code);
69 69
         
70
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
70
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
71 71
     }
72 72
 
73
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
73
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
74 74
 }
75 75
 
76 76
 function wpinv_store_address() {
77
-    $address = wpinv_get_option( 'store_address', '' );
77
+    $address = wpinv_get_option('store_address', '');
78 78
 
79
-    return apply_filters( 'wpinv_store_address', $address );
79
+    return apply_filters('wpinv_store_address', $address);
80 80
 }
81 81
 
82
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
82
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
83 83
     global $wpi_userID;
84 84
     
85
-    if( empty( $user_id ) ) {
86
-        $user_id = !empty( $wpi_userID ) ? $wpi_userID : get_current_user_id();
85
+    if (empty($user_id)) {
86
+        $user_id = !empty($wpi_userID) ? $wpi_userID : get_current_user_id();
87 87
     }
88 88
     
89 89
     $address_fields = array(
@@ -101,29 +101,29 @@  discard block
 block discarded – undo
101 101
         'zip',
102 102
     );
103 103
     
104
-    $user_info = get_userdata( $user_id );
104
+    $user_info = get_userdata($user_id);
105 105
     
106 106
     $address = array();
107 107
     $address['user_id'] = $user_id;
108
-    $address['email'] = !empty( $user_info ) ? $user_info->user_email : '';
109
-    foreach ( $address_fields as $field ) {
110
-        $address[$field] = get_user_meta( $user_id, '_wpinv_' . $field, true );
108
+    $address['email'] = !empty($user_info) ? $user_info->user_email : '';
109
+    foreach ($address_fields as $field) {
110
+        $address[$field] = get_user_meta($user_id, '_wpinv_' . $field, true);
111 111
     }
112 112
 
113
-    if ( !empty( $user_info ) ) {
114
-        if( empty( $address['first_name'] ) )
113
+    if (!empty($user_info)) {
114
+        if (empty($address['first_name']))
115 115
             $address['first_name'] = $user_info->first_name;
116 116
         
117
-        if( empty( $address['last_name'] ) )
117
+        if (empty($address['last_name']))
118 118
             $address['last_name'] = $user_info->last_name;
119 119
     }
120 120
     
121
-    $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
121
+    $address['name'] = trim(trim($address['first_name'] . ' ' . $address['last_name']), ",");
122 122
     
123
-    if( empty( $address['state'] ) && $with_default )
123
+    if (empty($address['state']) && $with_default)
124 124
         $address['state'] = wpinv_get_default_state();
125 125
 
126
-    if( empty( $address['country'] ) && $with_default )
126
+    if (empty($address['country']) && $with_default)
127 127
         $address['country'] = wpinv_get_default_country();
128 128
 
129 129
 
@@ -137,16 +137,16 @@  discard block
 block discarded – undo
137 137
  * @param string $return What to return.
138 138
  * @return array
139 139
  */
140
-function wpinv_get_continents( $return = 'all' ) {
140
+function wpinv_get_continents($return = 'all') {
141 141
 
142
-    $continents = wpinv_get_data( 'continents' );
142
+    $continents = wpinv_get_data('continents');
143 143
 
144
-    switch( $return ) {
144
+    switch ($return) {
145 145
         case 'name' :
146
-            return wp_list_pluck( $continents, 'name' );
146
+            return wp_list_pluck($continents, 'name');
147 147
             break;
148 148
         case 'countries' :
149
-            return wp_list_pluck( $continents, 'countries' );
149
+            return wp_list_pluck($continents, 'countries');
150 150
             break;
151 151
         default :
152 152
             return $continents;
@@ -162,12 +162,12 @@  discard block
 block discarded – undo
162 162
  * @param string $country Country code. If no code is specified, defaults to the default country.
163 163
  * @return string
164 164
  */
165
-function wpinv_get_continent_code_for_country( $country = false ) {
165
+function wpinv_get_continent_code_for_country($country = false) {
166 166
 
167
-    $country = wpinv_sanitize_country( $country );
167
+    $country = wpinv_sanitize_country($country);
168 168
     
169
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
170
-		if ( false !== array_search( $country, $countries, true ) ) {
169
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
170
+		if (false !== array_search($country, $countries, true)) {
171 171
 			return $continent_code;
172 172
 		}
173 173
 	}
@@ -183,13 +183,13 @@  discard block
 block discarded – undo
183 183
  * @param string $country Country code. If no code is specified, defaults to the default country.
184 184
  * @return array
185 185
  */
186
-function wpinv_get_country_calling_code( $country = null) {
186
+function wpinv_get_country_calling_code($country = null) {
187 187
 
188
-    $country = wpinv_sanitize_country( $country );
189
-    $codes   = wpinv_get_data( 'phone-codes' );
190
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
188
+    $country = wpinv_sanitize_country($country);
189
+    $codes   = wpinv_get_data('phone-codes');
190
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
191 191
 
192
-    if ( is_array( $code ) ) {
192
+    if (is_array($code)) {
193 193
         return $code[0];
194 194
     }
195 195
     return $code;
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
  * @param bool $first_empty Whether or not the first item in the list should be empty
203 203
  * @return array
204 204
  */
205
-function wpinv_get_country_list( $first_empty = false ) {
206
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
205
+function wpinv_get_country_list($first_empty = false) {
206
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
207 207
 }
208 208
 
209 209
 /**
@@ -213,22 +213,22 @@  discard block
 block discarded – undo
213 213
  * @param bool $first_empty Whether or not the first item in the list should be empty
214 214
  * @return array
215 215
  */
216
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
216
+function wpinv_get_country_states($country = null, $first_empty = false) {
217 217
     
218 218
     // Prepare the country.
219
-    $country = wpinv_sanitize_country( $country );
219
+    $country = wpinv_sanitize_country($country);
220 220
 
221 221
     // Fetch all states.
222
-    $all_states = wpinv_get_data( 'states' );
222
+    $all_states = wpinv_get_data('states');
223 223
 
224 224
     // Fetch the specified country's states.
225
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array() ;
226
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
227
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
225
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
226
+    $states     = apply_filters("wpinv_{$country}_states", $states);
227
+    $states     = apply_filters('wpinv_country_states', $states, $country);
228 228
 
229
-    asort( $states );
229
+    asort($states);
230 230
      
231
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
231
+    return wpinv_maybe_add_empty_option($states, $first_empty);
232 232
 }
233 233
 
234 234
 /**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
  * @return array
239 239
  */
240 240
 function wpinv_get_us_states_list() {
241
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
241
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
242 242
 }
243 243
 
244 244
 /**
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
  * @return array
249 249
  */
250 250
 function wpinv_get_canada_states_list() {
251
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
251
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
252 252
 }
253 253
 
254 254
 /**
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
  * @return array
259 259
  */
260 260
 function wpinv_get_australia_states_list() {
261
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
261
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
262 262
 }
263 263
 
264 264
 /**
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
  * @return array
269 269
  */
270 270
 function wpinv_get_bangladesh_states_list() {
271
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
271
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
272 272
 }
273 273
 
274 274
 /**
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
  * @return array
279 279
  */
280 280
 function wpinv_get_brazil_states_list() {
281
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
281
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
282 282
 }
283 283
 
284 284
 /**
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
  * @return array
289 289
  */
290 290
 function wpinv_get_bulgaria_states_list() {
291
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
291
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
292 292
 }
293 293
 
294 294
 /**
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
  * @return array
299 299
  */
300 300
 function wpinv_get_hong_kong_states_list() {
301
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
301
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
302 302
 }
303 303
 
304 304
 /**
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
  * @return array
309 309
  */
310 310
 function wpinv_get_hungary_states_list() {
311
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
311
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
312 312
 }
313 313
 
314 314
 /**
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
  * @return array
319 319
  */
320 320
 function wpinv_get_japan_states_list() {
321
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
321
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
322 322
 }
323 323
 
324 324
 /**
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
  * @return array
329 329
  */
330 330
 function wpinv_get_china_states_list() {
331
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
331
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
332 332
 }
333 333
 
334 334
 /**
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
  * @return array
339 339
  */
340 340
 function wpinv_get_new_zealand_states_list() {
341
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
341
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
342 342
 }
343 343
 
344 344
 /**
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
  * @return array
349 349
  */
350 350
 function wpinv_get_peru_states_list() {
351
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
351
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
352 352
 }
353 353
 
354 354
 /**
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
  * @return array
359 359
  */
360 360
 function wpinv_get_indonesia_states_list() {
361
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
361
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
362 362
 }
363 363
 
364 364
 /**
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
  * @return array
369 369
  */
370 370
 function wpinv_get_india_states_list() {
371
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
371
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
372 372
 }
373 373
 
374 374
 /**
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
  * @return array
379 379
  */
380 380
 function wpinv_get_iran_states_list() {
381
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
381
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
382 382
 }
383 383
 
384 384
 /**
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
  * @return array
389 389
  */
390 390
 function wpinv_get_italy_states_list() {
391
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
391
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
392 392
 }
393 393
 
394 394
 /**
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
  * @return array
399 399
  */
400 400
 function wpinv_get_malaysia_states_list() {
401
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
401
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
402 402
 }
403 403
 
404 404
 /**
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
  * @return array
409 409
  */
410 410
 function wpinv_get_mexico_states_list() {
411
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
411
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
412 412
 }
413 413
 
414 414
 /**
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
  * @return array
419 419
  */
420 420
 function wpinv_get_nepal_states_list() {
421
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
421
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
422 422
 }
423 423
 
424 424
 /**
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
  * @return array
429 429
  */
430 430
 function wpinv_get_south_africa_states_list() {
431
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
431
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
432 432
 }
433 433
 
434 434
 /**
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
  * @return array
439 439
  */
440 440
 function wpinv_get_thailand_states_list() {
441
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
441
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
442 442
 }
443 443
 
444 444
 /**
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
  * @return array
449 449
  */
450 450
 function wpinv_get_turkey_states_list() {
451
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
451
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
452 452
 }
453 453
 
454 454
 /**
@@ -458,28 +458,28 @@  discard block
 block discarded – undo
458 458
  * @return array
459 459
  */
460 460
 function wpinv_get_spain_states_list() {
461
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
461
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
462 462
 }
463 463
 
464 464
 function wpinv_get_states_field() {
465
-	if( empty( $_POST['country'] ) ) {
465
+	if (empty($_POST['country'])) {
466 466
 		$_POST['country'] = wpinv_get_default_country();
467 467
 	}
468
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
468
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
469 469
 
470
-	if( !empty( $states ) ) {
471
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
470
+	if (!empty($states)) {
471
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
472 472
         
473 473
         $args = array(
474 474
 			'name'    => $sanitized_field_name,
475 475
 			'id'      => $sanitized_field_name,
476 476
 			'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
477
-			'options' => array_merge( array( '' => '' ), $states ),
477
+			'options' => array_merge(array('' => ''), $states),
478 478
 			'show_option_all'  => false,
479 479
 			'show_option_none' => false
480 480
 		);
481 481
 
482
-		$response = wpinv_html_select( $args );
482
+		$response = wpinv_html_select($args);
483 483
 
484 484
 	} else {
485 485
 		$response = 'nostates';
@@ -488,10 +488,10 @@  discard block
 block discarded – undo
488 488
 	return $response;
489 489
 }
490 490
 
491
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
492
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
491
+function wpinv_default_billing_country($country = '', $user_id = 0) {
492
+    $country = !empty($country) ? $country : wpinv_get_default_country();
493 493
     
494
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
494
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
495 495
 }
496 496
 
497 497
 /**
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
  */
504 504
 function wpinv_get_address_formats() {
505 505
 
506
-		return apply_filters( 'wpinv_localisation_address_formats',
506
+		return apply_filters('wpinv_localisation_address_formats',
507 507
 			array(
508 508
 				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
509 509
 				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
@@ -552,9 +552,9 @@  discard block
 block discarded – undo
552 552
  * @see `wpinv_get_invoice_address_replacements`
553 553
  * @return string
554 554
  */
555
-function wpinv_get_full_address_format( $country = false) {
555
+function wpinv_get_full_address_format($country = false) {
556 556
 
557
-    if( empty( $country ) ) {
557
+    if (empty($country)) {
558 558
         $country = wpinv_get_default_country();
559 559
     }
560 560
 
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 	$formats = wpinv_get_address_formats();
563 563
 
564 564
 	// Get format for the specified country.
565
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
565
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
566 566
     
567 567
     /**
568 568
 	 * Filters the address format to use on Invoices.
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	 * @param string $format  The address format to use.
575 575
      * @param string $country The country who's address format is being retrieved.
576 576
 	 */
577
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
577
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
578 578
 }
579 579
 
580 580
 /**
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
  * @param array $billing_details customer's billing details
586 586
  * @return array
587 587
  */
588
-function wpinv_get_invoice_address_replacements( $billing_details ) {
588
+function wpinv_get_invoice_address_replacements($billing_details) {
589 589
 
590 590
     $default_args = array(
591 591
         'address'           => '',
@@ -598,22 +598,22 @@  discard block
 block discarded – undo
598 598
 		'company'           => '',
599 599
     );
600 600
 
601
-    $args    = array_map( 'trim', wp_parse_args( $billing_details, $default_args ) );
601
+    $args    = array_map('trim', wp_parse_args($billing_details, $default_args));
602 602
     $state   = $args['state'];
603 603
     $country = $args['country'];
604 604
     
605 605
     // Handle full country name.
606
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
606
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
607 607
     
608 608
     // Handle full state name.
609
-    $full_state   = ( $country && $state ) ?  wpinv_state_name( $state, $country ) : $state;
609
+    $full_state   = ($country && $state) ?  wpinv_state_name($state, $country) : $state;
610 610
 
611 611
     $args['postcode']    = $args['zip'];
612 612
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
613 613
     $args['state']       = $full_state;
614 614
     $args['state_code']  = $state;
615 615
     $args['country']     = $full_country;
616
-    $args['country_code']= $country;
616
+    $args['country_code'] = $country;
617 617
 
618 618
     /**
619 619
 	 * Filters the address format replacements to use on Invoices.
@@ -624,14 +624,14 @@  discard block
 block discarded – undo
624 624
 	 * @param array $replacements  The address replacements to use.
625 625
      * @param array $billing_details  The billing details to use.
626 626
 	 */
627
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
627
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
628 628
 
629 629
     $return = array();
630 630
 
631
-    foreach( $replacements as $key => $value ) {
632
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
631
+    foreach ($replacements as $key => $value) {
632
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
633 633
         $return['{{' . $key . '}}'] = $value;
634
-        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper( $value );
634
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
635 635
     }
636 636
 
637 637
     return $return;
@@ -645,6 +645,6 @@  discard block
 block discarded – undo
645 645
  * @since 1.0.14
646 646
  * @return string
647 647
  */
648
-function wpinv_trim_formatted_address_line( $line ) {
649
-	return trim( $line, ', ' );
648
+function wpinv_trim_formatted_address_line($line) {
649
+	return trim($line, ', ');
650 650
 }
651 651
\ No newline at end of file
Please login to merge, or discard this patch.
widgets/buy-item.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if (!defined('ABSPATH')) {
3 3
     exit;
4 4
 }
5 5
 
@@ -23,40 +23,40 @@  discard block
 block discarded – undo
23 23
             'block-keywords'=> "['invoicing','buy', 'buy item']",
24 24
             'class_name'     => __CLASS__,
25 25
             'base_id'       => 'wpinv_buy',
26
-            'name'          => __('Invoicing > Buy Item Button','invoicing'),
26
+            'name'          => __('Invoicing > Buy Item Button', 'invoicing'),
27 27
             'widget_ops'    => array(
28 28
                 'classname'   => 'wpinv-buy-item-class  wpi-g',
29
-                'description' => esc_html__('Displays buy invoicing item button.','invoicing'),
29
+                'description' => esc_html__('Displays buy invoicing item button.', 'invoicing'),
30 30
             ),
31 31
             'arguments'     => array(
32 32
                 'title'  => array(
33
-                    'title'       => __( 'Widget title', 'invoicing' ),
34
-                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
33
+                    'title'       => __('Widget title', 'invoicing'),
34
+                    'desc'        => __('Enter widget title.', 'invoicing'),
35 35
                     'type'        => 'text',
36 36
                     'desc_tip'    => true,
37 37
                     'default'     => '',
38 38
                     'advanced'    => false
39 39
                 ),
40 40
                 'items'  => array(
41
-	                'title'       => __( 'Items to buy', 'invoicing' ),
42
-	                'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
41
+	                'title'       => __('Items to buy', 'invoicing'),
42
+	                'desc'        => __('Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing'),
43 43
 	                'type'        => 'text',
44 44
 	                'desc_tip'    => true,
45 45
 	                'default'     => '',
46
-	                'placeholder' => __('Items to buy','invoicing'),
46
+	                'placeholder' => __('Items to buy', 'invoicing'),
47 47
 	                'advanced'    => false
48 48
                 ),
49 49
                 'label'  => array(
50
-	                'title'       => __( 'Button Label', 'invoicing' ),
51
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
50
+	                'title'       => __('Button Label', 'invoicing'),
51
+	                'desc'        => __('Enter button label. Default "Buy Now".', 'invoicing'),
52 52
 	                'type'        => 'text',
53 53
 	                'desc_tip'    => true,
54
-	                'default'     => __( 'Buy Now', 'invoicing' ),
54
+	                'default'     => __('Buy Now', 'invoicing'),
55 55
 	                'advanced'    => false
56 56
                 ),
57 57
                 'post_id'  => array(
58
-	                'title'       => __( 'Post ID', 'invoicing' ),
59
-	                'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
58
+	                'title'       => __('Post ID', 'invoicing'),
59
+	                'desc'        => __('Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing'),
60 60
 	                'type'        => 'number',
61 61
 	                'desc_tip'    => true,
62 62
 	                'default'     => '',
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         );
68 68
 
69 69
 
70
-        parent::__construct( $options );
70
+        parent::__construct($options);
71 71
     }
72 72
 
73 73
 	/**
@@ -79,31 +79,31 @@  discard block
 block discarded – undo
79 79
 	 *
80 80
 	 * @return string
81 81
 	 */
82
-    public function output( $args = array(), $widget_args = array(), $content = '' ) {
82
+    public function output($args = array(), $widget_args = array(), $content = '') {
83 83
 
84 84
 	    $defaults = array(
85 85
 		    'buy_items'     => '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
86
-		    'button_label'  => __( 'Buy Now', 'invoicing' ), // the button title
86
+		    'button_label'  => __('Buy Now', 'invoicing'), // the button title
87 87
 		    'post_id'   	=> '', // any related post_id
88 88
 	    );
89 89
 
90 90
 	    /**
91 91
 	     * Parse incoming $args into an array and merge it with $defaults
92 92
 	     */
93
-	    $args = wp_parse_args( $args, $defaults );
93
+	    $args = wp_parse_args($args, $defaults);
94 94
 
95 95
 		$html = '<div class="wpi-buy-button-wrapper wpi-g">';
96 96
 		
97
-		if ( empty( $args['buy_items'] ) ) {
98
-			$html .= __( 'No items selected', 'invoicing' );
97
+		if (empty($args['buy_items'])) {
98
+			$html .= __('No items selected', 'invoicing');
99 99
 		} else {
100
-			$post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
101
-			$label   = isset( $args['button_label'] ) ? sanitize_text_field( $args['button_label'] ) : __( 'Buy Now', 'invoicing' );
102
-			$items   = esc_attr( $args['buy_items'] );
100
+			$post_id = isset($args['post_id']) && is_numeric($args['post_id']) ? sanitize_text_field($args['post_id']) : 0;
101
+			$label   = isset($args['button_label']) ? sanitize_text_field($args['button_label']) : __('Buy Now', 'invoicing');
102
+			$items   = esc_attr($args['buy_items']);
103 103
 			$html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$label</button>";
104 104
 		}
105 105
 	
106
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
106
+	    $html .= wp_nonce_field('wpinv_buy_items', 'wpinv_buy_nonce', true, false);
107 107
 	    $html .= '</div>';
108 108
 
109 109
 	    return $html;
Please login to merge, or discard this patch.