Passed
Pull Request — master (#39)
by Kiran
03:58
created
invoicing.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,19 +11,19 @@  discard block
 block discarded – undo
11 11
 */
12 12
 
13 13
 // MUST have WordPress.
14
-if ( !defined( 'WPINC' ) ) {
15
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
14
+if (!defined('WPINC')) {
15
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
16 16
 }
17 17
 
18
-if ( !defined( 'WPINV_VERSION' ) ) {
19
-    define( 'WPINV_VERSION', '0.0.4' );
18
+if (!defined('WPINV_VERSION')) {
19
+    define('WPINV_VERSION', '0.0.4');
20 20
 }
21 21
 
22
-if ( !defined( 'WPINV_PLUGIN_FILE' ) ) {
23
-    define( 'WPINV_PLUGIN_FILE', __FILE__ );
22
+if (!defined('WPINV_PLUGIN_FILE')) {
23
+    define('WPINV_PLUGIN_FILE', __FILE__);
24 24
 }
25 25
 
26
-require plugin_dir_path( __FILE__ ) . 'includes/class-wpinv.php';
26
+require plugin_dir_path(__FILE__) . 'includes/class-wpinv.php';
27 27
 
28 28
 function wpinv_run() {
29 29
     global $invoicing;
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
40 40
 /**
41 41
  * Show update plugin admin notification.
42 42
  */
43
-if(is_admin()){
43
+if (is_admin()) {
44 44
     if (!function_exists('ayecode_show_update_plugin_requirement')) {//only load the update file if needed
45 45
         function ayecode_show_update_plugin_requirement() {
46
-            if ( !defined( 'WP_EASY_UPDATES_ACTIVE' ) ) {
46
+            if (!defined('WP_EASY_UPDATES_ACTIVE')) {
47 47
                 ?>
48 48
                 <div class="notice notice-warning is-dismissible">
49 49
                     <p>
50 50
                         <strong>
51 51
                             <?php
52
-                            echo sprintf( __( 'The plugin %sWP Easy Updates%s is required to check for and update some installed plugins, please install it now.', 'geodirectory' ), '<a href="https://wpeasyupdates.com/" target="_blank" title="WP Easy Updates">', '</a>' );
52
+                            echo sprintf(__('The plugin %sWP Easy Updates%s is required to check for and update some installed plugins, please install it now.', 'geodirectory'), '<a href="https://wpeasyupdates.com/" target="_blank" title="WP Easy Updates">', '</a>');
53 53
                             ?>
54 54
                         </strong>
55 55
                     </p>
@@ -58,6 +58,6 @@  discard block
 block discarded – undo
58 58
             }
59 59
         }
60 60
 
61
-        add_action( 'admin_notices', 'ayecode_show_update_plugin_requirement' );
61
+        add_action('admin_notices', 'ayecode_show_update_plugin_requirement');
62 62
     }
63 63
 }
Please login to merge, or discard this patch.
includes/admin/meta-boxes/class-mb-invoice-items.php 1 patch
Spacing   +142 added lines, -142 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // MUST have WordPress.
3
-if ( !defined( 'WPINC' ) ) {
4
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
3
+if (!defined('WPINC')) {
4
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
5 5
 }
6 6
 
7 7
 class WPInv_Meta_Box_Items {
8
-    public static function output( $post ) {        
8
+    public static function output($post) {        
9 9
         global $wpinv_euvat, $ajax_cart_details;
10 10
         
11
-        $post_id            = !empty( $post->ID ) ? $post->ID : 0;
12
-        $invoice            = new WPInv_Invoice( $post_id );
11
+        $post_id            = !empty($post->ID) ? $post->ID : 0;
12
+        $invoice            = new WPInv_Invoice($post_id);
13 13
         $ajax_cart_details  = $invoice->get_cart_details();
14
-        $subtotal           = $invoice->get_subtotal( true );
14
+        $subtotal           = $invoice->get_subtotal(true);
15 15
         $discount_raw       = $invoice->get_discount();
16
-        $discount           = wpinv_price( $discount_raw, $invoice->get_currency() );
16
+        $discount           = wpinv_price($discount_raw, $invoice->get_currency());
17 17
         $discounts          = $discount_raw > 0 ? $invoice->get_discounts() : '';
18
-        $tax                = $invoice->get_tax( true );
19
-        $total              = $invoice->get_total( true );
18
+        $tax                = $invoice->get_tax(true);
19
+        $total              = $invoice->get_total(true);
20 20
         $item_quantities    = wpinv_item_quantities_enabled();
21 21
         $use_taxes          = wpinv_use_taxes();
22 22
         $item_types         = wpinv_get_item_types();
@@ -27,17 +27,17 @@  discard block
 block discarded – undo
27 27
         }
28 28
         
29 29
         $cols = 5;
30
-        if ( $item_quantities ) {
30
+        if ($item_quantities) {
31 31
             $cols++;
32 32
         }
33
-        if ( $use_taxes ) {
33
+        if ($use_taxes) {
34 34
             $cols++;
35 35
         }
36 36
         $class = '';
37
-        if ( $invoice->is_paid() ) {
37
+        if ($invoice->is_paid()) {
38 38
             $class .= ' wpinv-paid';
39 39
         }
40
-        if ( $is_recurring ) {
40
+        if ($is_recurring) {
41 41
             $class .= ' wpi-recurring';
42 42
         }
43 43
         ?>
@@ -45,21 +45,21 @@  discard block
 block discarded – undo
45 45
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
46 46
                 <thead>
47 47
                     <tr>
48
-                        <th class="id"><?php _e( 'ID', 'invoicing' );?></th>
49
-                        <th class="title"><?php _e( 'Item', 'invoicing' );?></th>
50
-                        <th class="price"><?php _e( 'Price', 'invoicing' );?></th>
51
-                        <?php if ( $item_quantities ) { ?>
52
-                        <th class="qty"><?php _e( 'Qty', 'invoicing' );?></th>
48
+                        <th class="id"><?php _e('ID', 'invoicing'); ?></th>
49
+                        <th class="title"><?php _e('Item', 'invoicing'); ?></th>
50
+                        <th class="price"><?php _e('Price', 'invoicing'); ?></th>
51
+                        <?php if ($item_quantities) { ?>
52
+                        <th class="qty"><?php _e('Qty', 'invoicing'); ?></th>
53 53
                         <?php } ?>
54
-                        <th class="total"><?php _e( 'Total', 'invoicing' );?></th>
55
-                        <?php if ( $use_taxes ) { ?>
56
-                        <th class="tax"><?php _e( 'Tax (%)', 'invoicing' );?></th>
54
+                        <th class="total"><?php _e('Total', 'invoicing'); ?></th>
55
+                        <?php if ($use_taxes) { ?>
56
+                        <th class="tax"><?php _e('Tax (%)', 'invoicing'); ?></th>
57 57
                         <?php } ?>
58 58
                         <th class="action"></th>
59 59
                     </tr>
60 60
                 </thead>
61 61
                 <tbody class="wpinv-line-items">
62
-                    <?php echo wpinv_admin_get_line_items( $invoice ); ?>
62
+                    <?php echo wpinv_admin_get_line_items($invoice); ?>
63 63
                 </tbody>
64 64
                 <tfoot class="wpinv-totals">
65 65
                     <tr>
@@ -71,44 +71,44 @@  discard block
 block discarded – undo
71 71
                                         </td>
72 72
                                         <td class="title">
73 73
                                             <input type="text" class="regular-text" placeholder="Item name" value="" name="_wpinv_quick[name]">
74
-                                            <?php if ( $wpinv_euvat->allow_vat_rules() ) { ?>
74
+                                            <?php if ($wpinv_euvat->allow_vat_rules()) { ?>
75 75
                                             <div class="wp-clearfix">
76 76
                                                 <label class="wpi-vat-rule">
77
-                                                    <span class="title"><?php _e( 'VAT rule type', 'invoicing' );?></span>
77
+                                                    <span class="title"><?php _e('VAT rule type', 'invoicing'); ?></span>
78 78
                                                     <span class="input-text-wrap">
79
-                                                        <?php echo wpinv_html_select( array(
79
+                                                        <?php echo wpinv_html_select(array(
80 80
                                                             'options'          => $wpinv_euvat->get_rules(),
81 81
                                                             'name'             => '_wpinv_quick[vat_rule]',
82 82
                                                             'id'               => '_wpinv_quick_vat_rule',
83 83
                                                             'show_option_all'  => false,
84 84
                                                             'show_option_none' => false,
85 85
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-rule',
86
-                                                        ) ); ?>
86
+                                                        )); ?>
87 87
                                                     </span>
88 88
                                                 </label>
89 89
                                             </div>
90
-                                            <?php } if ( $wpinv_euvat->allow_vat_classes() ) { ?>
90
+                                            <?php } if ($wpinv_euvat->allow_vat_classes()) { ?>
91 91
                                             <div class="wp-clearfix">
92 92
                                                 <label class="wpi-vat-class">
93
-                                                    <span class="title"><?php _e( 'VAT class', 'invoicing' );?></span>
93
+                                                    <span class="title"><?php _e('VAT class', 'invoicing'); ?></span>
94 94
                                                     <span class="input-text-wrap">
95
-                                                        <?php echo wpinv_html_select( array(
95
+                                                        <?php echo wpinv_html_select(array(
96 96
                                                             'options'          => $wpinv_euvat->get_all_classes(),
97 97
                                                             'name'             => '_wpinv_quick[vat_class]',
98 98
                                                             'id'               => '_wpinv_quick_vat_class',
99 99
                                                             'show_option_all'  => false,
100 100
                                                             'show_option_none' => false,
101 101
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-vat-class',
102
-                                                        ) ); ?>
102
+                                                        )); ?>
103 103
                                                     </span>
104 104
                                                 </label>
105 105
                                             </div>
106 106
                                             <?php } ?>
107 107
                                             <div class="wp-clearfix">
108 108
                                                 <label class="wpi-item-type">
109
-                                                    <span class="title"><?php _e( 'Item type', 'invoicing' );?></span>
109
+                                                    <span class="title"><?php _e('Item type', 'invoicing'); ?></span>
110 110
                                                     <span class="input-text-wrap">
111
-                                                        <?php echo wpinv_html_select( array(
111
+                                                        <?php echo wpinv_html_select(array(
112 112
                                                             'options'          => $item_types,
113 113
                                                             'name'             => '_wpinv_quick[type]',
114 114
                                                             'id'               => '_wpinv_quick_type',
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
                                                             'show_option_all'  => false,
117 117
                                                             'show_option_none' => false,
118 118
                                                             'class'            => 'gdmbx2-text-medium wpinv-quick-type',
119
-                                                        ) ); ?>
119
+                                                        )); ?>
120 120
                                                     </span>
121 121
                                                 </label>
122 122
                                             </div>
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
                                             </div>
130 130
                                         </td>
131 131
                                         <td class="price"><input type="text" placeholder="0.00" class="wpi-field-price wpi-price" name="_wpinv_quick[price]" /></td>
132
-                                        <?php if ( $item_quantities ) { ?>
132
+                                        <?php if ($item_quantities) { ?>
133 133
                                         <td class="qty"><input type="number" class="small-text" step="1" min="1" value="1" name="_wpinv_quick[qty]" /></td>
134 134
                                         <?php } ?>
135 135
                                         <td class="total"></td>
136
-                                        <?php if ( $use_taxes ) { ?>
136
+                                        <?php if ($use_taxes) { ?>
137 137
                                         <td class="tax"></td>
138 138
                                         <?php } ?>
139 139
                                         <td class="action"></td>
@@ -146,29 +146,29 @@  discard block
 block discarded – undo
146 146
                         <td colspan="<?php echo $cols; ?>"></td>
147 147
                     </tr>
148 148
                     <tr class="totals">
149
-                        <td colspan="<?php echo ( $cols - 4 ); ?>"></td>
149
+                        <td colspan="<?php echo ($cols - 4); ?>"></td>
150 150
                         <td colspan="4">
151 151
                             <table cellspacing="0" cellpadding="0">
152 152
                                 <tr class="subtotal">
153
-                                    <td class="name"><?php _e( 'Sub Total:', 'invoicing' );?></td>
154
-                                    <td class="total"><?php echo $subtotal;?></td>
153
+                                    <td class="name"><?php _e('Sub Total:', 'invoicing'); ?></td>
154
+                                    <td class="total"><?php echo $subtotal; ?></td>
155 155
                                     <td class="action"></td>
156 156
                                 </tr>
157 157
                                 <tr class="discount">
158
-                                    <td class="name"><?php wpinv_get_discount_label( wpinv_discount_code( $invoice->ID ) ); ?>:</td>
159
-                                    <td class="total"><?php echo wpinv_discount( $invoice->ID, true, true ); ?></td>
158
+                                    <td class="name"><?php wpinv_get_discount_label(wpinv_discount_code($invoice->ID)); ?>:</td>
159
+                                    <td class="total"><?php echo wpinv_discount($invoice->ID, true, true); ?></td>
160 160
                                     <td class="action"></td>
161 161
                                 </tr>
162
-                                <?php if ( $use_taxes ) { ?>
162
+                                <?php if ($use_taxes) { ?>
163 163
                                 <tr class="tax">
164
-                                    <td class="name"><?php _e( 'Tax:', 'invoicing' );?></td>
165
-                                    <td class="total"><?php echo $tax;?></td>
164
+                                    <td class="name"><?php _e('Tax:', 'invoicing'); ?></td>
165
+                                    <td class="total"><?php echo $tax; ?></td>
166 166
                                     <td class="action"></td>
167 167
                                 </tr>
168 168
                                 <?php } ?>
169 169
                                 <tr class="total">
170
-                                    <td class="name"><?php _e( 'Invoice Total:', 'invoicing' );?></td>
171
-                                    <td class="total"><?php echo $total;?></td>
170
+                                    <td class="name"><?php _e('Invoice Total:', 'invoicing'); ?></td>
171
+                                    <td class="total"><?php echo $total; ?></td>
172 172
                                     <td class="action"></td>
173 173
                                 </tr>
174 174
                             </table>
@@ -178,89 +178,89 @@  discard block
 block discarded – undo
178 178
             </table>
179 179
             <div class="wpinv-actions">
180 180
                 <?php
181
-                    if ( !$invoice->is_paid() ) {
182
-                    if ( !$invoice->is_recurring() ) {
183
-                    echo wpinv_item_dropdown( array(
181
+                    if (!$invoice->is_paid()) {
182
+                    if (!$invoice->is_recurring()) {
183
+                    echo wpinv_item_dropdown(array(
184 184
                         'name'             => 'wpinv_invoice_item',
185 185
                         'id'               => 'wpinv_invoice_item',
186 186
                         'with_packages'    => false,
187 187
                         'show_recurring'   => true,
188
-                    ) );
188
+                    ));
189 189
                     ?>
190
-                    <input type="button" value="<?php esc_attr_e( 'Add item to Invoice', 'invoicing' );?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e( 'Create new item', 'invoicing' );?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e( 'Recalculate Totals', 'invoicing' );?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
190
+                    <input type="button" value="<?php esc_attr_e('Add item to Invoice', 'invoicing'); ?>" class="button button-primary" id="wpinv-add-item"><input type="button" value="<?php esc_attr_e('Create new item', 'invoicing'); ?>" class="button button-primary" id="wpinv-new-item"><?php } ?><input type="button" value="<?php esc_attr_e('Recalculate Totals', 'invoicing'); ?>" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">
191 191
                     <?php } ?>
192
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
192
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
193 193
             </div>
194 194
         </div>
195 195
         <?php
196 196
     }
197 197
     
198
-    public static function prices( $post ) {        
198
+    public static function prices($post) {        
199 199
         $symbol         = wpinv_currency_symbol();
200 200
         $position       = wpinv_currency_position();
201
-        $item           = new WPInv_Item( $post->ID );
201
+        $item           = new WPInv_Item($post->ID);
202 202
         
203 203
         $price          = $item->get_price();
204 204
         $is_recurring   = $item->is_recurring();
205 205
         $period         = $item->get_recurring_period();
206
-        $interval       = absint( $item->get_recurring_interval() );
207
-        $times          = absint( $item->get_recurring_limit() );
206
+        $interval       = absint($item->get_recurring_interval());
207
+        $times          = absint($item->get_recurring_limit());
208 208
         $free_trial     = $item->has_free_trial();
209 209
         $trial_interval = $item->get_trial_interval();
210 210
         $trial_period   = $item->get_trial_period();
211 211
         
212 212
         $intervals      = array();
213
-        for ( $i = 1; $i <= 90; $i++ ) {
213
+        for ($i = 1; $i <= 90; $i++) {
214 214
             $intervals[$i] = $i;
215 215
         }
216 216
         
217
-        $interval       = $interval > 0 ? $interval : 1;
217
+        $interval = $interval > 0 ? $interval : 1;
218 218
         
219 219
         $class = $is_recurring ? 'wpinv-recurring-y' : 'wpinv-recurring-n';
220 220
         ?>
221
-        <p class="wpinv-row-prices"><?php echo ( $position != 'right' ? $symbol . '&nbsp;' : '' );?><input type="text" maxlength="12" placeholder="<?php echo wpinv_format_amount( 0 ); ?>" value="<?php echo wpinv_format_amount( $price );?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled( $item->is_package(), true ); ?> /><?php echo ( $position == 'right' ? '&nbsp;' . $symbol : '' );?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce( 'wpinv_item_meta_box_save' ) ;?>" />
222
-        <?php if ( $item->is_package() ) { ?>
223
-        <span class="description"><?php _e( 'GD package item price can be edited only from GD payment manager.', 'invoicing' ); ?></span>
221
+        <p class="wpinv-row-prices"><?php echo ($position != 'right' ? $symbol . '&nbsp;' : ''); ?><input type="text" maxlength="12" placeholder="<?php echo wpinv_format_amount(0); ?>" value="<?php echo wpinv_format_amount($price); ?>" id="wpinv_item_price" name="wpinv_item_price" class="medium-text wpi-field-price wpi-price" <?php disabled($item->is_package(), true); ?> /><?php echo ($position == 'right' ? '&nbsp;' . $symbol : ''); ?><input type="hidden" name="wpinv_vat_meta_box_nonce" value="<?php echo wp_create_nonce('wpinv_item_meta_box_save'); ?>" />
222
+        <?php if ($item->is_package()) { ?>
223
+        <span class="description"><?php _e('GD package item price can be edited only from GD payment manager.', 'invoicing'); ?></span>
224 224
         <?php } ?>
225 225
         </p>
226 226
         <p class="wpinv-row-is-recurring">
227 227
             <label for="wpinv_is_recurring">
228
-                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked( 1, $is_recurring ); ?> />
229
-                <?php echo apply_filters( 'wpinv_is_recurring_toggle_text', __( 'Is Recurring Item?', 'invoicing' ) ); ?>
228
+                <input type="checkbox" name="wpinv_is_recurring" id="wpinv_is_recurring" value="1" <?php checked(1, $is_recurring); ?> />
229
+                <?php echo apply_filters('wpinv_is_recurring_toggle_text', __('Is Recurring Item?', 'invoicing')); ?>
230 230
             </label>
231 231
         </p>
232
-        <p class="wpinv-row-recurring-fields <?php echo $class;?>">
233
-                <label class="wpinv-period" for="wpinv_recurring_period"><?php _e( 'Recurring', 'invoicing' );?> <select class="wpinv-select " id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e( 'day(s)', 'invoicing' ); ?>" <?php selected( 'D', $period );?>><?php _e( 'Daily', 'invoicing' ); ?></option><option value="W" data-text="<?php esc_attr_e( 'week(s)', 'invoicing' ); ?>" <?php selected( 'W', $period );?>><?php _e( 'Weekly', 'invoicing' ); ?></option><option value="M" data-text="<?php esc_attr_e( 'month(s)', 'invoicing' ); ?>" <?php selected( 'M', $period );?>><?php _e( 'Monthly', 'invoicing' ); ?></option><option value="Y" data-text="<?php esc_attr_e( 'year(s)', 'invoicing' ); ?>" <?php selected( 'Y', $period );?>><?php _e( 'Yearly', 'invoicing' ); ?></option></select></label>
234
-                <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e( 'at every', 'invoicing' );?> <?php echo wpinv_html_select( array(
232
+        <p class="wpinv-row-recurring-fields <?php echo $class; ?>">
233
+                <label class="wpinv-period" for="wpinv_recurring_period"><?php _e('Recurring', 'invoicing'); ?> <select class="wpinv-select " id="wpinv_recurring_period" name="wpinv_recurring_period"><option value="D" data-text="<?php esc_attr_e('day(s)', 'invoicing'); ?>" <?php selected('D', $period); ?>><?php _e('Daily', 'invoicing'); ?></option><option value="W" data-text="<?php esc_attr_e('week(s)', 'invoicing'); ?>" <?php selected('W', $period); ?>><?php _e('Weekly', 'invoicing'); ?></option><option value="M" data-text="<?php esc_attr_e('month(s)', 'invoicing'); ?>" <?php selected('M', $period); ?>><?php _e('Monthly', 'invoicing'); ?></option><option value="Y" data-text="<?php esc_attr_e('year(s)', 'invoicing'); ?>" <?php selected('Y', $period); ?>><?php _e('Yearly', 'invoicing'); ?></option></select></label>
234
+                <label class="wpinv-interval" for="wpinv_recurring_interval"> <?php _e('at every', 'invoicing'); ?> <?php echo wpinv_html_select(array(
235 235
                     'options'          => $intervals,
236 236
                     'name'             => 'wpinv_recurring_interval',
237 237
                     'id'               => 'wpinv_recurring_interval',
238 238
                     'selected'         => $interval,
239 239
                     'show_option_all'  => false,
240 240
                     'show_option_none' => false
241
-                ) ); ?> <span id="wpinv_interval_text"><?php _e( 'day(s)', 'invoicing' );?></span></label>
242
-                <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e( 'for', 'invoicing' );?> <input class="small-text" type="number" value="<?php echo $times;?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e( 'time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing' );?></label>
241
+                )); ?> <span id="wpinv_interval_text"><?php _e('day(s)', 'invoicing'); ?></span></label>
242
+                <label class="wpinv-times" for="wpinv_recurring_limit"> <?php _e('for', 'invoicing'); ?> <input class="small-text" type="number" value="<?php echo $times; ?>" size="4" id="wpinv_recurring_limit" name="wpinv_recurring_limit" step="1" min="0"> <?php _e('time(s) <i>(select 0 for recurring forever until cancelled</i>)', 'invoicing'); ?></label>
243 243
                 <span class="clear wpi-trial-clr"></span>
244 244
                 <label class="wpinv-free-trial" for="wpinv_free_trial">
245
-                    <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked( true, (bool)$free_trial ); ?> /> 
246
-                    <?php echo __( 'Offer free trial for', 'invoicing' ); ?>
245
+                    <input type="checkbox" name="wpinv_free_trial" id="wpinv_free_trial" value="1" <?php checked(true, (bool)$free_trial); ?> /> 
246
+                    <?php echo __('Offer free trial for', 'invoicing'); ?>
247 247
                 </label>
248 248
                 <label class="wpinv-trial-interval" for="wpinv_trial_interval">
249
-                    <input class="small-text" type="number" value="<?php echo $trial_interval;?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected( 'D', $trial_period );?>><?php _e( 'day(s)', 'invoicing' ); ?></option><option value="W" <?php selected( 'W', $trial_period );?>><?php _e( 'week(s)', 'invoicing' ); ?></option><option value="M" <?php selected( 'M', $trial_period );?>><?php _e( 'month(s)', 'invoicing' ); ?></option><option value="Y" <?php selected( 'Y', $trial_period );?>><?php _e( 'year(s)', 'invoicing' ); ?></option></select>
249
+                    <input class="small-text" type="number" value="<?php echo $trial_interval; ?>" size="4" id="wpinv_trial_interval" name="wpinv_trial_interval" step="1" min="1"> <select class="wpinv-select" id="wpinv_trial_period" name="wpinv_trial_period"><option value="D" <?php selected('D', $trial_period); ?>><?php _e('day(s)', 'invoicing'); ?></option><option value="W" <?php selected('W', $trial_period); ?>><?php _e('week(s)', 'invoicing'); ?></option><option value="M" <?php selected('M', $trial_period); ?>><?php _e('month(s)', 'invoicing'); ?></option><option value="Y" <?php selected('Y', $trial_period); ?>><?php _e('year(s)', 'invoicing'); ?></option></select>
250 250
                 </label>
251 251
         </p>
252
-        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type( $post->ID ); ?>" />
253
-        <?php do_action( 'wpinv_item_price_field', $post->ID ); ?>
252
+        <input type="hidden" id="_wpi_current_type" value="<?php echo wpinv_get_item_type($post->ID); ?>" />
253
+        <?php do_action('wpinv_item_price_field', $post->ID); ?>
254 254
         <?php
255 255
     }
256 256
     
257
-    public static function vat_rules( $post ) {
257
+    public static function vat_rules($post) {
258 258
         global $wpinv_euvat;
259 259
         
260
-        $rule_type = $wpinv_euvat->get_item_rule( $post->ID );
260
+        $rule_type = $wpinv_euvat->get_item_rule($post->ID);
261 261
         ?>
262
-        <p><label for="wpinv_vat_rules"><strong><?php _e( 'Select how VAT rules will be applied:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
263
-        <?php echo wpinv_html_select( array(
262
+        <p><label for="wpinv_vat_rules"><strong><?php _e('Select how VAT rules will be applied:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
263
+        <?php echo wpinv_html_select(array(
264 264
                     'options'          => $wpinv_euvat->get_rules(),
265 265
                     'name'             => 'wpinv_vat_rules',
266 266
                     'id'               => 'wpinv_vat_rules',
@@ -268,19 +268,19 @@  discard block
 block discarded – undo
268 268
                     'show_option_all'  => false,
269 269
                     'show_option_none' => false,
270 270
                     'class'            => 'gdmbx2-text-medium wpinv-vat-rules',
271
-                ) ); ?>
271
+                )); ?>
272 272
         </p>
273
-        <p class="wpi-m0"><?php _e( 'When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing' ); ?></p>
274
-        <p class="wpi-m0"><?php _e( 'If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing' ); ?></p>
273
+        <p class="wpi-m0"><?php _e('When you select physical product rules, only consumers and businesses in your country will be charged VAT.  The VAT rate used will be the rate in your country.', 'invoicing'); ?></p>
274
+        <p class="wpi-m0"><?php _e('If you select Digital product rules, VAT will be charged at the rate that applies in the country of the consumer.  Only businesses in your country will be charged VAT.', 'invoicing'); ?></p>
275 275
         <?php
276 276
     }
277 277
     
278
-    public static function vat_classes( $post ) {
278
+    public static function vat_classes($post) {
279 279
         global $wpinv_euvat;
280 280
         
281
-        $vat_class = $wpinv_euvat->get_item_class( $post->ID );
281
+        $vat_class = $wpinv_euvat->get_item_class($post->ID);
282 282
         ?>
283
-        <p><?php echo wpinv_html_select( array(
283
+        <p><?php echo wpinv_html_select(array(
284 284
                     'options'          => $wpinv_euvat->get_all_classes(),
285 285
                     'name'             => 'wpinv_vat_class',
286 286
                     'id'               => 'wpinv_vat_class',
@@ -288,18 +288,18 @@  discard block
 block discarded – undo
288 288
                     'show_option_all'  => false,
289 289
                     'show_option_none' => false,
290 290
                     'class'            => 'gdmbx2-text-medium wpinv-vat-class',
291
-                ) ); ?>
291
+                )); ?>
292 292
         </p>
293
-        <p class="wpi-m0"><?php _e( 'Select the VAT rate class to use for this invoice item.', 'invoicing' ); ?></p>
293
+        <p class="wpi-m0"><?php _e('Select the VAT rate class to use for this invoice item.', 'invoicing'); ?></p>
294 294
         <?php
295 295
     }
296 296
     
297
-    public static function item_info( $post ) {
298
-        $item_type = wpinv_get_item_type( $post->ID );
299
-        do_action( 'wpinv_item_info_metabox_before', $post );
297
+    public static function item_info($post) {
298
+        $item_type = wpinv_get_item_type($post->ID);
299
+        do_action('wpinv_item_info_metabox_before', $post);
300 300
         ?>
301
-        <p><label for="wpinv_item_type"><strong><?php _e( 'Type:', 'invoicing' );?></strong></label>&nbsp;&nbsp;&nbsp;
302
-        <?php echo wpinv_html_select( array(
301
+        <p><label for="wpinv_item_type"><strong><?php _e('Type:', 'invoicing'); ?></strong></label>&nbsp;&nbsp;&nbsp;
302
+        <?php echo wpinv_html_select(array(
303 303
                     'options'          => wpinv_get_item_types(),
304 304
                     'name'             => 'wpinv_item_type',
305 305
                     'id'               => 'wpinv_item_type',
@@ -308,93 +308,93 @@  discard block
 block discarded – undo
308 308
                     'show_option_none' => false,
309 309
                     'class'            => 'gdmbx2-text-medium wpinv-item-type',
310 310
                     //'disabled'         => $item_type == 'package' ? true : false,
311
-                ) ); ?>
311
+                )); ?>
312 312
         </p>
313
-        <p class="wpi-m0"><?php _e( 'Select item type.', 'invoicing' );?><br><?php _e( 'Standard: standard item type', 'invoicing' );?><br><?php _e( 'Fee: like Registration Fee, Signup Fee etc.', 'invoicing' );?></p>
313
+        <p class="wpi-m0"><?php _e('Select item type.', 'invoicing'); ?><br><?php _e('Standard: standard item type', 'invoicing'); ?><br><?php _e('Fee: like Registration Fee, Signup Fee etc.', 'invoicing'); ?></p>
314 314
         <?php
315
-        do_action( 'wpinv_item_info_metabox_after', $post );
315
+        do_action('wpinv_item_info_metabox_after', $post);
316 316
     }
317 317
     
318
-    public static function save( $post_id, $data, $post ) {
319
-        $invoice        = new WPInv_Invoice( $post_id );
318
+    public static function save($post_id, $data, $post) {
319
+        $invoice        = new WPInv_Invoice($post_id);
320 320
         
321 321
         // Billing
322
-        $first_name     = sanitize_text_field( $data['wpinv_first_name'] );
323
-        $last_name      = sanitize_text_field( $data['wpinv_last_name'] );
324
-        $company        = sanitize_text_field( $data['wpinv_company'] );
325
-        $vat_number     = sanitize_text_field( $data['wpinv_vat_number'] );
326
-        $phone          = sanitize_text_field( $data['wpinv_phone'] );
327
-        $address        = sanitize_text_field( $data['wpinv_address'] );
328
-        $city           = sanitize_text_field( $data['wpinv_city'] );
329
-        $zip            = sanitize_text_field( $data['wpinv_zip'] );
330
-        $country        = sanitize_text_field( $data['wpinv_country'] );
331
-        $state          = sanitize_text_field( $data['wpinv_state'] );
322
+        $first_name     = sanitize_text_field($data['wpinv_first_name']);
323
+        $last_name      = sanitize_text_field($data['wpinv_last_name']);
324
+        $company        = sanitize_text_field($data['wpinv_company']);
325
+        $vat_number     = sanitize_text_field($data['wpinv_vat_number']);
326
+        $phone          = sanitize_text_field($data['wpinv_phone']);
327
+        $address        = sanitize_text_field($data['wpinv_address']);
328
+        $city           = sanitize_text_field($data['wpinv_city']);
329
+        $zip            = sanitize_text_field($data['wpinv_zip']);
330
+        $country        = sanitize_text_field($data['wpinv_country']);
331
+        $state          = sanitize_text_field($data['wpinv_state']);
332 332
         
333 333
         // Details
334
-        $status         = sanitize_text_field( $data['wpinv_status'] );
335
-        $old_status     = !empty( $data['original_post_status'] ) ? sanitize_text_field( $data['original_post_status'] ) : $status;
336
-        $number         = sanitize_text_field( $data['wpinv_number'] );
337
-        $due_date       = isset( $data['wpinv_due_date'] ) ? sanitize_text_field( $data['wpinv_due_date'] ) : '';
334
+        $status         = sanitize_text_field($data['wpinv_status']);
335
+        $old_status     = !empty($data['original_post_status']) ? sanitize_text_field($data['original_post_status']) : $status;
336
+        $number         = sanitize_text_field($data['wpinv_number']);
337
+        $due_date       = isset($data['wpinv_due_date']) ? sanitize_text_field($data['wpinv_due_date']) : '';
338 338
         //$discounts      = sanitize_text_field( $data['wpinv_discounts'] );
339 339
         //$discount       = sanitize_text_field( $data['wpinv_discount'] );
340 340
         
341
-        $ip             = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
341
+        $ip = $invoice->get_ip() ? $invoice->get_ip() : wpinv_get_ip();
342 342
         
343
-        $invoice->set( 'due_date', $due_date );
344
-        $invoice->set( 'first_name', $first_name );
345
-        $invoice->set( 'last_name', $last_name );
346
-        $invoice->set( 'company', $company );
347
-        $invoice->set( 'vat_number', $vat_number );
348
-        $invoice->set( 'phone', $phone );
349
-        $invoice->set( 'address', $address );
350
-        $invoice->set( 'city', $city );
351
-        $invoice->set( 'zip', $zip );
352
-        $invoice->set( 'country', $country );
353
-        $invoice->set( 'state', $state );
354
-        $invoice->set( 'status', $status );
355
-        $invoice->set( 'number', $number );
343
+        $invoice->set('due_date', $due_date);
344
+        $invoice->set('first_name', $first_name);
345
+        $invoice->set('last_name', $last_name);
346
+        $invoice->set('company', $company);
347
+        $invoice->set('vat_number', $vat_number);
348
+        $invoice->set('phone', $phone);
349
+        $invoice->set('address', $address);
350
+        $invoice->set('city', $city);
351
+        $invoice->set('zip', $zip);
352
+        $invoice->set('country', $country);
353
+        $invoice->set('state', $state);
354
+        $invoice->set('status', $status);
355
+        $invoice->set('number', $number);
356 356
         //$invoice->set( 'discounts', $discounts );
357 357
         //$invoice->set( 'discount', $discount );
358
-        $invoice->set( 'ip', $ip );
358
+        $invoice->set('ip', $ip);
359 359
         $invoice->old_status = $_POST['original_post_status'];
360 360
         $invoice->currency = wpinv_get_currency();
361
-        if ( !empty( $data['wpinv_gateway'] ) ) {
362
-            $invoice->set( 'gateway', sanitize_text_field( $data['wpinv_gateway'] ) );
361
+        if (!empty($data['wpinv_gateway'])) {
362
+            $invoice->set('gateway', sanitize_text_field($data['wpinv_gateway']));
363 363
         }
364 364
         $saved = $invoice->save();
365 365
         
366 366
         // Check for payment notes
367
-        if ( !empty( $data['invoice_note'] ) ) {
368
-            $note               = wp_kses( $data['invoice_note'], array() );
369
-            $note_type          = sanitize_text_field( $data['invoice_note_type'] );
367
+        if (!empty($data['invoice_note'])) {
368
+            $note               = wp_kses($data['invoice_note'], array());
369
+            $note_type          = sanitize_text_field($data['invoice_note_type']);
370 370
             $is_customer_note   = $note_type == 'customer' ? 1 : 0;
371 371
         
372
-            wpinv_insert_payment_note( $invoice->ID, $note, $is_customer_note );
372
+            wpinv_insert_payment_note($invoice->ID, $note, $is_customer_note);
373 373
         }
374 374
         
375 375
         // Update user address if empty.
376
-        if ( $saved && !empty( $invoice ) ) {
377
-            if ( $user_id = $invoice->get_user_id() ) {
378
-                $user_address = wpinv_get_user_address( $user_id, false );
376
+        if ($saved && !empty($invoice)) {
377
+            if ($user_id = $invoice->get_user_id()) {
378
+                $user_address = wpinv_get_user_address($user_id, false);
379 379
                 
380 380
                 if (empty($user_address['first_name'])) {
381
-                    update_user_meta( $user_id, '_wpinv_first_name', $first_name );
382
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
381
+                    update_user_meta($user_id, '_wpinv_first_name', $first_name);
382
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
383 383
                 } else if (empty($user_address['last_name']) && $user_address['first_name'] == $first_name) {
384
-                    update_user_meta( $user_id, '_wpinv_last_name', $last_name );
384
+                    update_user_meta($user_id, '_wpinv_last_name', $last_name);
385 385
                 }
386 386
                 
387 387
                 if (empty($user_address['address']) || empty($user_address['city']) || empty($user_address['state']) || empty($user_address['country'])) {
388
-                    update_user_meta( $user_id, '_wpinv_address', $address );
389
-                    update_user_meta( $user_id, '_wpinv_city', $city );
390
-                    update_user_meta( $user_id, '_wpinv_state', $state );
391
-                    update_user_meta( $user_id, '_wpinv_country', $country );
392
-                    update_user_meta( $user_id, '_wpinv_zip', $zip );
393
-                    update_user_meta( $user_id, '_wpinv_phone', $phone );
388
+                    update_user_meta($user_id, '_wpinv_address', $address);
389
+                    update_user_meta($user_id, '_wpinv_city', $city);
390
+                    update_user_meta($user_id, '_wpinv_state', $state);
391
+                    update_user_meta($user_id, '_wpinv_country', $country);
392
+                    update_user_meta($user_id, '_wpinv_zip', $zip);
393
+                    update_user_meta($user_id, '_wpinv_phone', $phone);
394 394
                 }
395 395
             }
396 396
             
397
-            do_action( 'wpinv_invoice_metabox_saveed', $invoice );
397
+            do_action('wpinv_invoice_metabox_saveed', $invoice);
398 398
         }
399 399
         
400 400
         return $saved;
Please login to merge, or discard this patch.
includes/wpinv-payment-functions.php 1 patch
Spacing   +160 added lines, -160 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-function wpinv_get_subscriptions( $args = array() ) {
3
-    if ( empty( $args['parent_invoice_id'] ) ) {
2
+function wpinv_get_subscriptions($args = array()) {
3
+    if (empty($args['parent_invoice_id'])) {
4 4
         return false;
5 5
     }
6 6
     
@@ -14,18 +14,18 @@  discard block
 block discarded – undo
14 14
     );
15 15
 
16 16
     $args['post_parent']    = $args['parent_invoice_id'];
17
-    $args                   = wp_parse_args( $args, $defaults );
17
+    $args                   = wp_parse_args($args, $defaults);
18 18
 
19
-    if( $args['numberposts'] < 1 ) {
19
+    if ($args['numberposts'] < 1) {
20 20
         $args['numberposts'] = 999999999999;
21 21
     }
22 22
 
23
-    $posts          = get_posts( $args );
23
+    $posts          = get_posts($args);
24 24
     $subscriptions  = array();
25
-    if ( !empty( $posts ) ) {
26
-        foreach ( $posts as $post ) {
27
-            if ( !empty( $post->ID ) ) {
28
-                $subscriptions[] = wpinv_get_invoice( $post->ID );
25
+    if (!empty($posts)) {
26
+        foreach ($posts as $post) {
27
+            if (!empty($post->ID)) {
28
+                $subscriptions[] = wpinv_get_invoice($post->ID);
29 29
             }
30 30
         }
31 31
     }
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
     
34 34
     return $subscriptions;
35 35
 }
36
-function wpinv_get_subscription( $id = 0, $by_profile_id = false ) {
36
+function wpinv_get_subscription($id = 0, $by_profile_id = false) {
37 37
     global $wpdb;
38 38
 
39
-    if ( empty( $id ) ) {
39
+    if (empty($id)) {
40 40
         return false;
41 41
     }
42 42
 
43
-    $id = esc_sql( $id );
43
+    $id = esc_sql($id);
44 44
 
45
-    $invoice_id = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1" );
45
+    $invoice_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1");
46 46
 
47
-    if ( $invoice_id != null ) {
48
-        return wpinv_get_invoice( $invoice_id );
47
+    if ($invoice_id != null) {
48
+        return wpinv_get_invoice($invoice_id);
49 49
     }
50 50
 
51 51
     return false;
@@ -55,49 +55,49 @@  discard block
 block discarded – undo
55 55
  * Records a new payment on the subscription
56 56
  * 
57 57
  */
58
-function wpinv_recurring_add_subscription_payment( $parent_invoice_id, $subscription_args = array() ) {    
59
-    $args = wp_parse_args( $subscription_args, array(
58
+function wpinv_recurring_add_subscription_payment($parent_invoice_id, $subscription_args = array()) {    
59
+    $args = wp_parse_args($subscription_args, array(
60 60
         'amount'         => '',
61 61
         'transaction_id' => '',
62 62
         'gateway'        => ''
63
-    ) );
63
+    ));
64 64
 
65
-    if ( wpinv_payment_exists( $args['transaction_id'] ) ) {
65
+    if (wpinv_payment_exists($args['transaction_id'])) {
66 66
         return false;
67 67
     }
68 68
     
69
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
70
-    if ( empty( $parent_invoice ) ) {
69
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
70
+    if (empty($parent_invoice)) {
71 71
         return;
72 72
     }
73 73
 
74 74
     $invoice = new WPInv_Invoice();
75
-    $invoice->set( 'parent_invoice', $parent_invoice_id );
76
-    $invoice->set( 'currency', $parent_invoice->get_currency() );
75
+    $invoice->set('parent_invoice', $parent_invoice_id);
76
+    $invoice->set('currency', $parent_invoice->get_currency());
77 77
     //$invoice->set( 'status', 'publish' );
78
-    $invoice->set( 'transaction_id', $args['transaction_id'] );
79
-    $invoice->set( 'key', $parent_invoice->get_key() );
78
+    $invoice->set('transaction_id', $args['transaction_id']);
79
+    $invoice->set('key', $parent_invoice->get_key());
80 80
     
81
-    $invoice->set( 'ip', $parent_invoice->ip );
82
-    $invoice->set( 'user_id', $parent_invoice->get_user_id() );
83
-    $invoice->set( 'first_name', $parent_invoice->get_first_name() );
84
-    $invoice->set( 'last_name', $parent_invoice->get_last_name() );
81
+    $invoice->set('ip', $parent_invoice->ip);
82
+    $invoice->set('user_id', $parent_invoice->get_user_id());
83
+    $invoice->set('first_name', $parent_invoice->get_first_name());
84
+    $invoice->set('last_name', $parent_invoice->get_last_name());
85 85
     ///$invoice->set( 'email', $parent_invoice->get_email() );
86
-    $invoice->set( 'phone', $parent_invoice->phone );
87
-    $invoice->set( 'address', $parent_invoice->address );
88
-    $invoice->set( 'city', $parent_invoice->city );
89
-    $invoice->set( 'country', $parent_invoice->country );
90
-    $invoice->set( 'state', $parent_invoice->state );
91
-    $invoice->set( 'zip', $parent_invoice->zip );
92
-    $invoice->set( 'company', $parent_invoice->company );
93
-    $invoice->set( 'vat_number', $parent_invoice->vat_number );
94
-    $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
95
-    $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
96
-
97
-    if ( empty( $args['gateway'] ) ) {
98
-        $invoice->set( 'gateway', $parent_invoice->get_gateway() );
86
+    $invoice->set('phone', $parent_invoice->phone);
87
+    $invoice->set('address', $parent_invoice->address);
88
+    $invoice->set('city', $parent_invoice->city);
89
+    $invoice->set('country', $parent_invoice->country);
90
+    $invoice->set('state', $parent_invoice->state);
91
+    $invoice->set('zip', $parent_invoice->zip);
92
+    $invoice->set('company', $parent_invoice->company);
93
+    $invoice->set('vat_number', $parent_invoice->vat_number);
94
+    $invoice->set('vat_rate', $parent_invoice->vat_rate);
95
+    $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
96
+
97
+    if (empty($args['gateway'])) {
98
+        $invoice->set('gateway', $parent_invoice->get_gateway());
99 99
     } else {
100
-        $invoice->set( 'gateway', $args['gateway'] );
100
+        $invoice->set('gateway', $args['gateway']);
101 101
     }
102 102
     
103 103
     $recurring_details = $parent_invoice->get_recurring_details();
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
     // increase the earnings for each item in the subscription
106 106
     $items = $recurring_details['cart_details'];
107 107
     
108
-    if ( $items ) {        
108
+    if ($items) {        
109 109
         $add_items      = array();
110 110
         $cart_details   = array();
111 111
         
112
-        foreach ( $items as $item ) {
112
+        foreach ($items as $item) {
113 113
             $add_item             = array();
114 114
             $add_item['id']       = $item['id'];
115 115
             $add_item['quantity'] = $item['quantity'];
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
             break;
120 120
         }
121 121
         
122
-        $invoice->set( 'items', $add_items );
122
+        $invoice->set('items', $add_items);
123 123
         $invoice->cart_details = $cart_details;
124 124
     }
125 125
     
@@ -129,277 +129,277 @@  discard block
 block discarded – undo
129 129
     $tax                = $recurring_details['tax'];
130 130
     $discount           = $recurring_details['discount'];
131 131
     
132
-    if ( $discount > 0 ) {
133
-        $invoice->set( 'discount_code', $parent_invoice->discount_code );
132
+    if ($discount > 0) {
133
+        $invoice->set('discount_code', $parent_invoice->discount_code);
134 134
     }
135 135
     
136
-    $invoice->subtotal = wpinv_format_amount( $subtotal, NULL, true );
137
-    $invoice->tax      = wpinv_format_amount( $tax, NULL, true );
138
-    $invoice->discount = wpinv_format_amount( $discount, NULL, true );
139
-    $invoice->total    = wpinv_format_amount( $total, NULL, true );
136
+    $invoice->subtotal = wpinv_format_amount($subtotal, NULL, true);
137
+    $invoice->tax      = wpinv_format_amount($tax, NULL, true);
138
+    $invoice->discount = wpinv_format_amount($discount, NULL, true);
139
+    $invoice->total    = wpinv_format_amount($total, NULL, true);
140 140
     $invoice->save();
141 141
     
142
-    wpinv_update_payment_status( $invoice->ID, 'publish' );
142
+    wpinv_update_payment_status($invoice->ID, 'publish');
143 143
     sleep(1);
144
-    wpinv_update_payment_status( $invoice->ID, 'wpi-renewal' );
144
+    wpinv_update_payment_status($invoice->ID, 'wpi-renewal');
145 145
     
146
-    $invoice = wpinv_get_invoice( $invoice->ID );
146
+    $invoice = wpinv_get_invoice($invoice->ID);
147 147
     
148
-    $subscription_data                      = wpinv_payment_subscription_data( $parent_invoice );
148
+    $subscription_data                      = wpinv_payment_subscription_data($parent_invoice);
149 149
     $subscription_data['recurring_amount']  = $invoice->get_total();
150
-    $subscription_data['created']           = current_time( 'mysql', 0 );
151
-    $subscription_data['expiration']        = $invoice->get_new_expiration( $subscription_data['item_id'] );
150
+    $subscription_data['created']           = current_time('mysql', 0);
151
+    $subscription_data['expiration']        = $invoice->get_new_expiration($subscription_data['item_id']);
152 152
     
153 153
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
154
-    $invoice->update_subscription( $subscription_data );
154
+    $invoice->update_subscription($subscription_data);
155 155
 
156
-    do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args );
157
-    do_action( 'wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args );
156
+    do_action('wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args);
157
+    do_action('wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args);
158 158
 
159 159
     return $invoice;
160 160
 }
161 161
 
162
-function wpinv_payment_exists( $txn_id = '' ) {
162
+function wpinv_payment_exists($txn_id = '') {
163 163
     global $wpdb;
164 164
 
165
-    if ( empty( $txn_id ) ) {
165
+    if (empty($txn_id)) {
166 166
         return false;
167 167
     }
168 168
 
169
-    $txn_id = esc_sql( $txn_id );
169
+    $txn_id = esc_sql($txn_id);
170 170
 
171
-    $invoice = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
171
+    $invoice = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
172 172
 
173
-    if ( $invoice != null ) {
173
+    if ($invoice != null) {
174 174
         return true;
175 175
     }
176 176
 
177 177
     return false;
178 178
 }
179 179
 
180
-function wpinv_is_subscription_payment( $invoice = '' ) {
181
-    if ( empty( $invoice ) ) {
180
+function wpinv_is_subscription_payment($invoice = '') {
181
+    if (empty($invoice)) {
182 182
         return false;
183 183
     }
184 184
     
185
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
186
-        $invoice = wpinv_get_invoice( $invoice );
185
+    if (!is_object($invoice) && is_scalar($invoice)) {
186
+        $invoice = wpinv_get_invoice($invoice);
187 187
     }
188 188
     
189
-    if ( empty( $invoice ) ) {
189
+    if (empty($invoice)) {
190 190
         return false;
191 191
     }
192 192
         
193
-    if ( $invoice->is_renewal() ) {
193
+    if ($invoice->is_renewal()) {
194 194
         return true;
195 195
     }
196 196
 
197 197
     return false;
198 198
 }
199 199
 
200
-function wpinv_payment_subscription_data( $invoice = '' ) {
201
-    if ( empty( $invoice ) ) {
200
+function wpinv_payment_subscription_data($invoice = '') {
201
+    if (empty($invoice)) {
202 202
         return false;
203 203
     }
204 204
     
205
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
206
-        $invoice = wpinv_get_invoice( $invoice );
205
+    if (!is_object($invoice) && is_scalar($invoice)) {
206
+        $invoice = wpinv_get_invoice($invoice);
207 207
     }
208 208
     
209
-    if ( empty( $invoice ) ) {
209
+    if (empty($invoice)) {
210 210
         return false;
211 211
     }    
212 212
 
213 213
     return $invoice->get_subscription_data();
214 214
 }
215 215
 
216
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
217
-    if ( empty( $invoice ) ) {
216
+function wpinv_payment_link_transaction_id($invoice = '') {
217
+    if (empty($invoice)) {
218 218
         return false;
219 219
     }
220 220
     
221
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
222
-        $invoice = wpinv_get_invoice( $invoice );
221
+    if (!is_object($invoice) && is_scalar($invoice)) {
222
+        $invoice = wpinv_get_invoice($invoice);
223 223
     }
224 224
     
225
-    if ( empty( $invoice ) ) {
225
+    if (empty($invoice)) {
226 226
         return false;
227 227
     }
228 228
 
229
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
229
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
230 230
 }
231 231
 
232
-function wpinv_get_pretty_subscription_period( $period ) {
232
+function wpinv_get_pretty_subscription_period($period) {
233 233
     $frequency = '';
234 234
     //Format period details
235
-    switch ( $period ) {
235
+    switch ($period) {
236 236
         case 'D' :
237 237
         case 'day' :
238
-            $frequency = __( 'Daily', 'invoicing' );
238
+            $frequency = __('Daily', 'invoicing');
239 239
             break;
240 240
         case 'W' :
241 241
         case 'week' :
242
-            $frequency = __( 'Weekly', 'invoicing' );
242
+            $frequency = __('Weekly', 'invoicing');
243 243
             break;
244 244
         case 'M' :
245 245
         case 'month' :
246
-            $frequency = __( 'Monthly', 'invoicing' );
246
+            $frequency = __('Monthly', 'invoicing');
247 247
             break;
248 248
         case 'Y' :
249 249
         case 'year' :
250
-            $frequency = __( 'Yearly', 'invoicing' );
250
+            $frequency = __('Yearly', 'invoicing');
251 251
             break;
252 252
         default :
253
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period', $frequency, $period );
253
+            $frequency = apply_filters('wpinv_pretty_subscription_period', $frequency, $period);
254 254
             break;
255 255
     }
256 256
 
257 257
     return $frequency;
258 258
 }
259 259
 
260
-function wpinv_get_pretty_subscription_period_name( $period ) {
260
+function wpinv_get_pretty_subscription_period_name($period) {
261 261
     $frequency = '';
262 262
     //Format period details
263
-    switch ( $period ) {
263
+    switch ($period) {
264 264
         case 'D' :
265 265
         case 'day' :
266
-            $frequency = __( 'Day', 'invoicing' );
266
+            $frequency = __('Day', 'invoicing');
267 267
             break;
268 268
         case 'W' :
269 269
         case 'week' :
270
-            $frequency = __( 'Week', 'invoicing' );
270
+            $frequency = __('Week', 'invoicing');
271 271
             break;
272 272
         case 'M' :
273 273
         case 'month' :
274
-            $frequency = __( 'Month', 'invoicing' );
274
+            $frequency = __('Month', 'invoicing');
275 275
             break;
276 276
         case 'Y' :
277 277
         case 'year' :
278
-            $frequency = __( 'Year', 'invoicing' );
278
+            $frequency = __('Year', 'invoicing');
279 279
             break;
280 280
         default :
281
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period_name', $frequency, $period );
281
+            $frequency = apply_filters('wpinv_pretty_subscription_period_name', $frequency, $period);
282 282
             break;
283 283
     }
284 284
 
285 285
     return $frequency;
286 286
 }
287 287
 
288
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
288
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
289 289
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
290 290
     
291
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
292
-        $amount = __( 'Free', 'invoicing' );
291
+    if ($trial_interval > 0 && !empty($trial_period)) {
292
+        $amount = __('Free', 'invoicing');
293 293
         $interval = $trial_interval;
294 294
         $period = $trial_period;
295 295
     }
296 296
     
297 297
     $description = '';
298
-    switch ( $period ) {
298
+    switch ($period) {
299 299
         case 'D' :
300 300
         case 'day' :
301
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
301
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
302 302
             break;
303 303
         case 'W' :
304 304
         case 'week' :
305
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
305
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
306 306
             break;
307 307
         case 'M' :
308 308
         case 'month' :
309
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
309
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
310 310
             break;
311 311
         case 'Y' :
312 312
         case 'year' :
313
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
313
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
314 314
             break;
315 315
     }
316 316
 
317
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
317
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
318 318
 }
319 319
 
320
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
320
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
321 321
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
322 322
     $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
323 323
     
324 324
     $description = '';
325
-    switch ( $period ) {
325
+    switch ($period) {
326 326
         case 'D' :
327 327
         case 'day' :            
328
-            if ( (int)$bill_times > 0 ) {
329
-                if ( $interval > 1 ) {
330
-                    if ( $bill_times > 1 ) {
331
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
328
+            if ((int)$bill_times > 0) {
329
+                if ($interval > 1) {
330
+                    if ($bill_times > 1) {
331
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
332 332
                     } else {
333
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
333
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
334 334
                     }
335 335
                 } else {
336
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
336
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
337 337
                 }
338 338
             } else {
339
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
339
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
340 340
             }
341 341
             break;
342 342
         case 'W' :
343 343
         case 'week' :            
344
-            if ( (int)$bill_times > 0 ) {
345
-                if ( $interval > 1 ) {
346
-                    if ( $bill_times > 1 ) {
347
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
344
+            if ((int)$bill_times > 0) {
345
+                if ($interval > 1) {
346
+                    if ($bill_times > 1) {
347
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
348 348
                     } else {
349
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
349
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
350 350
                     }
351 351
                 } else {
352
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
352
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
353 353
                 }
354 354
             } else {
355
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
355
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
356 356
             }
357 357
             break;
358 358
         case 'M' :
359 359
         case 'month' :            
360
-            if ( (int)$bill_times > 0 ) {
361
-                if ( $interval > 1 ) {
362
-                    if ( $bill_times > 1 ) {
363
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
360
+            if ((int)$bill_times > 0) {
361
+                if ($interval > 1) {
362
+                    if ($bill_times > 1) {
363
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
364 364
                     } else {
365
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
365
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
366 366
                     }
367 367
                 } else {
368
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
368
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
369 369
                 }
370 370
             } else {
371
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
371
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
372 372
             }
373 373
             break;
374 374
         case 'Y' :
375 375
         case 'year' :            
376
-            if ( (int)$bill_times > 0 ) {
377
-                if ( $interval > 1 ) {
378
-                    if ( $bill_times > 1 ) {
379
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
376
+            if ((int)$bill_times > 0) {
377
+                if ($interval > 1) {
378
+                    if ($bill_times > 1) {
379
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
380 380
                     } else {
381
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
381
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
382 382
                     }
383 383
                 } else {
384
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
384
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
385 385
                 }
386 386
             } else {
387
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
387
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
388 388
             }
389 389
             break;
390 390
     }
391 391
 
392
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
392
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
393 393
 }
394 394
 
395
-function wpinv_subscription_payment_desc( $invoice ) {
396
-    if ( empty( $invoice ) ) {
395
+function wpinv_subscription_payment_desc($invoice) {
396
+    if (empty($invoice)) {
397 397
         return NULL;
398 398
     }
399 399
     
400 400
     $description = '';
401
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
402
-        if ( $item->has_free_trial() ) {
401
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
402
+        if ($item->has_free_trial()) {
403 403
             $trial_period = $item->get_trial_period();
404 404
             $trial_interval = $item->get_trial_interval();
405 405
         } else {
@@ -407,45 +407,45 @@  discard block
 block discarded – undo
407 407
             $trial_interval = 0;
408 408
         }
409 409
         
410
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
410
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
411 411
     }
412 412
     
413
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
413
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
414 414
 }
415 415
 
416
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
417
-    $initial_total      = wpinv_format_amount( $initial );
418
-    $recurring_total    = wpinv_format_amount( $recurring );
416
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
417
+    $initial_total      = wpinv_format_amount($initial);
418
+    $recurring_total    = wpinv_format_amount($recurring);
419 419
     
420
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
420
+    if ($trial_interval > 0 && !empty($trial_period)) {
421 421
         // Free trial
422 422
     } else {
423
-        if ( $bill_times == 1 ) {
423
+        if ($bill_times == 1) {
424 424
             $recurring_total = $initial_total;
425
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
425
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
426 426
             $bill_times--;
427 427
         }
428 428
     }
429 429
     
430
-    $initial_amount     = wpinv_price( $initial_total, $currency );
431
-    $recurring_amount   = wpinv_price( $recurring_total, $currency );
430
+    $initial_amount     = wpinv_price($initial_total, $currency);
431
+    $recurring_amount   = wpinv_price($recurring_total, $currency);
432 432
     
433
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
433
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
434 434
         
435
-    if ( $initial_total != $recurring_total ) {
436
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
435
+    if ($initial_total != $recurring_total) {
436
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
437 437
         
438
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
438
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
439 439
     } else {
440 440
         $description    = $recurring;
441 441
     }
442 442
     
443
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
443
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
444 444
 }
445 445
 
446
-function wpinv_recurring_send_payment_failed( $invoice ) {
447
-    if ( !empty( $invoice->ID ) ) {
448
-        wpinv_failed_invoice_notification( $invoice->ID );
446
+function wpinv_recurring_send_payment_failed($invoice) {
447
+    if (!empty($invoice->ID)) {
448
+        wpinv_failed_invoice_notification($invoice->ID);
449 449
     }
450 450
 }
451
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
452 451
\ No newline at end of file
452
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
453 453
\ No newline at end of file
Please login to merge, or discard this patch.
includes/admin/wpinv-upgrade-functions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,22 +11,22 @@
 block discarded – undo
11 11
  * @since 1.0.0
12 12
 */
13 13
 function wpinv_automatic_upgrade() {
14
-    $wpi_version = get_option( 'wpinv_version' );
14
+    $wpi_version = get_option('wpinv_version');
15 15
     
16
-    if ( $wpi_version == WPINV_VERSION ) {
16
+    if ($wpi_version == WPINV_VERSION) {
17 17
         return;
18 18
     }
19 19
     
20
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
20
+    if (version_compare($wpi_version, '0.0.5', '<')) {
21 21
         wpinv_v005_upgrades();
22 22
     }
23 23
     
24
-    update_option( 'wpinv_version', WPINV_VERSION );
24
+    update_option('wpinv_version', WPINV_VERSION);
25 25
 }
26
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
26
+add_action('admin_init', 'wpinv_automatic_upgrade');
27 27
 
28 28
 function wpinv_v005_upgrades() {
29 29
     global $wpdb;
30 30
     
31
-    $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
31
+    $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
32 32
 }
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
includes/class-wpinv.php 1 patch
Spacing   +154 added lines, -154 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
 class WPInv_Plugin {
15 15
     private static $instance;
16 16
     
17 17
     public static function run() {
18
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
18
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
19 19
             self::$instance = new WPInv_Plugin;
20 20
             self::$instance->includes();
21 21
             self::$instance->actions();
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
             self::$instance->reports    = new WPInv_Reports();
24 24
         }
25 25
         
26
-        do_action( 'wpinv_loaded' );
26
+        do_action('wpinv_loaded');
27 27
         
28 28
         return self::$instance;
29 29
     }
@@ -33,31 +33,31 @@  discard block
 block discarded – undo
33 33
     }
34 34
     
35 35
     public function define_constants() {
36
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
37
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
36
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
37
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
38 38
     }
39 39
     
40 40
     private function actions() {
41 41
         /* Internationalize the text strings used. */
42
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
42
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
43 43
         
44 44
         /* Perform actions on admin initialization. */
45
-        add_action( 'admin_init', array( &$this, 'admin_init') );
46
-        add_action( 'init', array( &$this, 'init' ), 3 );
47
-        add_action( 'init', array( 'WPInv_Shortcodes', 'init' ) );
48
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
45
+        add_action('admin_init', array(&$this, 'admin_init'));
46
+        add_action('init', array(&$this, 'init'), 3);
47
+        add_action('init', array('WPInv_Shortcodes', 'init'));
48
+        add_action('init', array(&$this, 'wpinv_actions'));
49 49
         
50
-        if ( class_exists( 'BuddyPress' ) ) {
51
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
50
+        if (class_exists('BuddyPress')) {
51
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
52 52
         }
53 53
 
54
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
54
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
55 55
         
56
-        if ( is_admin() ) {
57
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
58
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
56
+        if (is_admin()) {
57
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
58
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
59 59
         } else {
60
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
60
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
61 61
         }
62 62
         
63 63
         /**
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
          *
68 68
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
69 69
          */
70
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
70
+        do_action_ref_array('wpinv_actions', array(&$this));
71 71
 
72
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
72
+        add_action('admin_init', array(&$this, 'activation_redirect'));
73 73
     }
74 74
     
75 75
     public function plugins_loaded() {
@@ -83,189 +83,189 @@  discard block
 block discarded – undo
83 83
      * @since 1.0
84 84
      */
85 85
     public function load_textdomain() {
86
-        $locale = apply_filters( 'plugin_locale', get_locale(), 'invoicing' );
86
+        $locale = apply_filters('plugin_locale', get_locale(), 'invoicing');
87 87
         
88
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
89
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
88
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
89
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
90 90
         
91 91
         /**
92 92
          * Define language constants.
93 93
          */
94
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
94
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
95 95
     }
96 96
         
97 97
     public function includes() {
98 98
         global $wpinv_options;
99 99
         
100
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
100
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
101 101
         $wpinv_options = wpinv_get_settings();
102 102
         
103
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
104
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
105
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
106
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
107
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
108
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
109
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
110
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
111
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
112
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
113
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
114
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
115
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
116
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gd-functions.php' );
117
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
118
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
119
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
120
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
121
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php' );
122
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
123
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
124
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
125
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php' );
126
-        if ( !class_exists( 'Geodir_EUVat' ) ) {
127
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
103
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
104
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
105
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
106
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
107
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
108
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
109
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
110
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
111
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
112
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
113
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
114
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
115
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
116
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gd-functions.php');
117
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
118
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
119
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
120
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
121
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php');
122
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
123
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
124
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
125
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php');
126
+        if (!class_exists('Geodir_EUVat')) {
127
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
128 128
         }
129 129
         
130
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
131
-        if ( !empty( $gateways ) ) {
132
-            foreach ( $gateways as $gateway ) {
133
-                if ( $gateway == 'manual' ) {
130
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
131
+        if (!empty($gateways)) {
132
+            foreach ($gateways as $gateway) {
133
+                if ($gateway == 'manual') {
134 134
                     continue;
135 135
                 }
136 136
                 
137 137
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
138 138
                 
139
-                if ( file_exists( $gateway_file ) ) {
140
-                    require_once( $gateway_file );
139
+                if (file_exists($gateway_file)) {
140
+                    require_once($gateway_file);
141 141
                 }
142 142
             }
143 143
         }
144
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
145
-        
146
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
147
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
148
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
149
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
150
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
151
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
152
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
153
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
154
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
144
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
145
+        
146
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
147
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
148
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
149
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
150
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
151
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
152
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
153
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
154
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
155 155
             
156 156
         }
157 157
         
158 158
         // include css inliner
159
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
160
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
159
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
160
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
161 161
         }
162 162
         
163
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
163
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
164 164
     }
165 165
     
166 166
     public function init() {
167 167
     }
168 168
     
169 169
     public function admin_init() {
170
-        if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
170
+        if (!(defined('DOING_AJAX') && DOING_AJAX)) {
171 171
         }
172 172
         
173
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
173
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
174 174
     }
175 175
 
176 176
     public function activation_redirect() {
177 177
         // Bail if no activation redirect
178
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
178
+        if (!get_transient('_wpinv_activation_redirect')) {
179 179
             return;
180 180
         }
181 181
 
182 182
         // Delete the redirect transient
183
-        delete_transient( '_wpinv_activation_redirect' );
183
+        delete_transient('_wpinv_activation_redirect');
184 184
 
185 185
         // Bail if activating from network, or bulk
186
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
186
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
187 187
             return;
188 188
         }
189 189
 
190
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
190
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
191 191
         exit;
192 192
     }
193 193
     
194 194
     public function enqueue_scripts() {
195
-        $suffix       = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
195
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
196 196
         
197
-        wp_deregister_style( 'font-awesome' );
198
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
199
-        wp_enqueue_style( 'font-awesome' );
197
+        wp_deregister_style('font-awesome');
198
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
199
+        wp_enqueue_style('font-awesome');
200 200
         
201
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
202
-        wp_enqueue_style( 'wpinv_front_style' );
201
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
202
+        wp_enqueue_style('wpinv_front_style');
203 203
                
204 204
         // Register scripts
205
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
206
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array( 'jquery', 'wpinv-vat-script' ),  WPINV_VERSION );
205
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
206
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array('jquery', 'wpinv-vat-script'), WPINV_VERSION);
207 207
         
208 208
         $localize                         = array();
209
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
210
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
209
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
210
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
211 211
         $localize['currency_symbol']      = wpinv_currency_symbol();
212 212
         $localize['currency_pos']         = wpinv_currency_position();
213 213
         $localize['thousand_sep']         = wpinv_thousands_seperator();
214 214
         $localize['decimal_sep']          = wpinv_decimal_seperator();
215 215
         $localize['decimals']             = wpinv_decimals();
216 216
         
217
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
217
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
218 218
         
219
-        wp_enqueue_script( 'jquery-blockui' );
220
-        wp_enqueue_script( 'wpinv-front-script' );
221
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
219
+        wp_enqueue_script('jquery-blockui');
220
+        wp_enqueue_script('wpinv-front-script');
221
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
222 222
     }
223 223
     
224 224
     public function admin_enqueue_scripts() {
225 225
         global $post, $pagenow;
226 226
         
227 227
         $post_type  = wpinv_admin_post_type();
228
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
228
+        $suffix     = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
229 229
         
230
-        wp_deregister_style( 'font-awesome' );
231
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
232
-        wp_enqueue_style( 'font-awesome' );
230
+        wp_deregister_style('font-awesome');
231
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
232
+        wp_enqueue_style('font-awesome');
233 233
         
234
-        wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
235
-        wp_enqueue_style( 'jquery-ui-css' );
234
+        wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
235
+        wp_enqueue_style('jquery-ui-css');
236 236
         
237
-        wp_register_style( 'jquery-chosen', WPINV_PLUGIN_URL . 'assets/css/chosen' . $suffix . '.css', array(), '1.6.2' );
238
-        wp_enqueue_style( 'jquery-chosen' );
237
+        wp_register_style('jquery-chosen', WPINV_PLUGIN_URL . 'assets/css/chosen' . $suffix . '.css', array(), '1.6.2');
238
+        wp_enqueue_style('jquery-chosen');
239 239
 
240
-        wp_register_script( 'jquery-chosen', WPINV_PLUGIN_URL . 'assets/js/chosen.jquery' . $suffix . '.js', array( 'jquery' ), '1.6.2' );
241
-        wp_enqueue_script( 'jquery-chosen' );
240
+        wp_register_script('jquery-chosen', WPINV_PLUGIN_URL . 'assets/js/chosen.jquery' . $suffix . '.js', array('jquery'), '1.6.2');
241
+        wp_enqueue_script('jquery-chosen');
242 242
         
243
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
244
-        wp_enqueue_style( 'wpinv_meta_box_style' );
243
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
244
+        wp_enqueue_style('wpinv_meta_box_style');
245 245
         
246
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
247
-        wp_enqueue_style( 'wpinv_admin_style' );
246
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
247
+        wp_enqueue_style('wpinv_admin_style');
248 248
         
249
-        if ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
250
-            wp_enqueue_script( 'jquery-ui-datepicker' );
249
+        if ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
250
+            wp_enqueue_script('jquery-ui-datepicker');
251 251
         }
252 252
 
253
-        wp_enqueue_style( 'wp-color-picker' );
254
-        wp_enqueue_script( 'wp-color-picker' );
253
+        wp_enqueue_style('wp-color-picker');
254
+        wp_enqueue_script('wp-color-picker');
255 255
         
256
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
256
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
257 257
         
258
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array( 'jquery', 'jquery-blockui' ),  WPINV_VERSION );
259
-        wp_enqueue_script( 'wpinv-admin-script' );
258
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array('jquery', 'jquery-blockui'), WPINV_VERSION);
259
+        wp_enqueue_script('wpinv-admin-script');
260 260
         
261 261
         $localize                               = array();
262
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
263
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
264
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
265
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
266
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
267
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
268
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
262
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
263
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
264
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
265
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
266
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
267
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
268
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
269 269
         $localize['tax']                        = wpinv_tax_amount();
270 270
         $localize['discount']                   = wpinv_discount_amount();
271 271
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -273,55 +273,55 @@  discard block
 block discarded – undo
273 273
         $localize['thousand_sep']               = wpinv_thousands_seperator();
274 274
         $localize['decimal_sep']                = wpinv_decimal_seperator();
275 275
         $localize['decimals']                   = wpinv_decimals();
276
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
277
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
278
-        $localize['status_pending']             = wpinv_status_nicename( 'pending' );
279
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
280
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
281
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
282
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
283
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
284
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
285
-        $localize['hasGD']                      = wpinv_gd_active();;
276
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
277
+        $localize['status_publish']             = wpinv_status_nicename('publish');
278
+        $localize['status_pending']             = wpinv_status_nicename('pending');
279
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
280
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
281
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
282
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
283
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
284
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
285
+        $localize['hasGD']                      = wpinv_gd_active(); ;
286 286
         $localize['hasPM']                      = wpinv_pm_active();
287
-        $localize['emptyInvoice']               = __( 'Add atleast one item to save invoice!', 'invoicing' );
288
-        $localize['deletePackage']              = __( 'GD package items should be deleted from GD payment manager only, otherwise it will break invoices that created with this package!', 'invoicing' );
289
-        $localize['deletePackages']             = __( 'GD package items should be deleted from GD payment manager only', 'invoicing' );
290
-        $localize['deleteInvoiceFirst']         = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
287
+        $localize['emptyInvoice']               = __('Add atleast one item to save invoice!', 'invoicing');
288
+        $localize['deletePackage']              = __('GD package items should be deleted from GD payment manager only, otherwise it will break invoices that created with this package!', 'invoicing');
289
+        $localize['deletePackages']             = __('GD package items should be deleted from GD payment manager only', 'invoicing');
290
+        $localize['deleteInvoiceFirst']         = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
291 291
         
292
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
292
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
293 293
     }
294 294
     
295
-    public function admin_body_class( $classes ) {
295
+    public function admin_body_class($classes) {
296 296
         global $pagenow;
297 297
         
298
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
298
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
299 299
 
300 300
         $add_class = false;
301
-        if ( $pagenow == 'admin.php' && $page ) {
302
-            $add_class = strpos( $page, 'wpinv-' );
301
+        if ($pagenow == 'admin.php' && $page) {
302
+            $add_class = strpos($page, 'wpinv-');
303 303
         }
304 304
         
305 305
         $settings_class = array();
306
-        if ( $page == 'wpinv-settings' ) {
307
-            if ( !empty( $_REQUEST['tab'] ) ) {
308
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
306
+        if ($page == 'wpinv-settings') {
307
+            if (!empty($_REQUEST['tab'])) {
308
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
309 309
             }
310 310
             
311
-            if ( !empty( $_REQUEST['section'] ) ) {
312
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
311
+            if (!empty($_REQUEST['section'])) {
312
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
313 313
             }
314 314
             
315
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
315
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
316 316
         }
317 317
         
318
-        if ( !empty( $settings_class ) ) {
319
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
318
+        if (!empty($settings_class)) {
319
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
320 320
         }
321 321
         
322 322
         $post_type = wpinv_admin_post_type();
323 323
         
324
-        if ( $post_type == 'wpi_invoice' || $add_class !== false ) {
324
+        if ($post_type == 'wpi_invoice' || $add_class !== false) {
325 325
             return $classes .= ' wpinv';
326 326
         } else {
327 327
             return $classes;
@@ -333,26 +333,26 @@  discard block
 block discarded – undo
333 333
     public function admin_print_scripts_edit_php() {
334 334
         $post_type = wpinv_admin_post_type();
335 335
         
336
-        if ( $post_type == 'wpi_item' ) {
337
-            wp_enqueue_script( 'wpinv-inline-edit-post', WPINV_PLUGIN_URL . 'assets/js/quick-edit.js', array( 'jquery', 'inline-edit-post' ), '', true );
336
+        if ($post_type == 'wpi_item') {
337
+            wp_enqueue_script('wpinv-inline-edit-post', WPINV_PLUGIN_URL . 'assets/js/quick-edit.js', array('jquery', 'inline-edit-post'), '', true);
338 338
         }
339 339
     }
340 340
     
341 341
     public function wpinv_actions() {
342
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
343
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
342
+        if (isset($_REQUEST['wpi_action'])) {
343
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
344 344
         }
345 345
     }
346 346
     
347
-    public function pre_get_posts( $wp_query ) {
348
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
349
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
347
+    public function pre_get_posts($wp_query) {
348
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
349
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
350 350
         }
351 351
         
352 352
         return $wp_query;
353 353
     }
354 354
     
355 355
     public function bp_invoicing_init() {
356
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
356
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
357 357
     }
358 358
 }
359 359
\ No newline at end of file
Please login to merge, or discard this patch.