Inspection of "Merge pull request #56 from mdrahul/master" - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( b0d50b...dd166b )

by Stiofan

created 2017-08-11 11:35 UTC

Status

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@
 block discarded – undo
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
 ?>

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,18 +1,18 @@
 block discarded – undo
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 ?>
 
-<p><?php printf( __( 'You have received payment from %s. The invoice is as follows:', 'invoicing' ), $invoice->get_user_full_name() ); ?></p>
+<p><?php printf(__('You have received payment from %s. The invoice is as follows:', 'invoicing'), $invoice->get_user_full_name()); ?></p>
 
 <?php
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

Please login to merge, or discard this patch.

templates/wpinv-invoice-print.php 1 patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -1,41 +1,41 @@  discard block
 block discarded – undo
 <?php 
-if ( !defined('ABSPATH') ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 global $post;
 $invoice_id = $post->ID;
-$invoice = wpinv_get_invoice( $invoice_id );
-if ( empty( $invoice ) ) {
+$invoice = wpinv_get_invoice($invoice_id);
+if (empty($invoice)) {
     exit;
 }
-$type = $post->post_type == 'wpi_invoice' ? __( 'Invoice', 'invoicing' ): __( 'Quotation', 'invoicing' );
-do_action( 'wpinv_invoice_print_before_display', $invoice ); ?><!DOCTYPE html>
+$type = $post->post_type == 'wpi_invoice' ? __('Invoice', 'invoicing') : __('Quotation', 'invoicing');
+do_action('wpinv_invoice_print_before_display', $invoice); ?><!DOCTYPE html>
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="UTF-8">
     <title><?php wp_title() ?></title>
-    <meta charset="<?php bloginfo( 'charset' ); ?>" />
+    <meta charset="<?php bloginfo('charset'); ?>" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="noindex,nofollow">
 
-    <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+    <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 </head>
 <body class="body wpinv wpinv-print">
-    <?php do_action( 'wpinv_invoice_print_body_start', $invoice ); ?>
+    <?php do_action('wpinv_invoice_print_body_start', $invoice); ?>
     <div class="container wpinv-wrap">
-        <?php if ( $watermark = wpinv_watermark( $invoice_id ) ) { ?>
-            <div class="watermark no-print"><p><?php echo esc_html( $watermark ) ?></p></div>
+        <?php if ($watermark = wpinv_watermark($invoice_id)) { ?>
+            <div class="watermark no-print"><p><?php echo esc_html($watermark) ?></p></div>
         <?php } ?>
         <!-- ///// Start PDF header -->
         <htmlpageheader name="wpinv-pdf-header">
-            <?php do_action( 'wpinv_invoice_print_before_header', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_before_header', $invoice); ?>
             <div class="row wpinv-header">
                 <div class="col-xs-6 wpinv-business">
-                    <a target="_blank" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php if ( $logo = wpinv_get_business_logo() ) { ?>
-                        <img class="logo" src="<?php echo esc_url( $logo ); ?>">
+                    <a target="_blank" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php if ($logo = wpinv_get_business_logo()) { ?>
+                        <img class="logo" src="<?php echo esc_url($logo); ?>">
                         <?php } else { ?>
-                        <h1><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+                        <h1><?php echo esc_html(wpinv_get_business_name()); ?></h1>
                         <?php } ?>
                     </a>
                 </div>
@@ -44,56 +44,56 @@  discard block
 block discarded – undo
                     <h2><?php echo $type; ?></h2>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invoice_print_after_header', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_after_header', $invoice); ?>
         </htmlpageheader>
         <!-- End PDF header ///// -->
         
-        <?php do_action( 'wpinv_invoice_print_before_top_content', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_before_top_content', $invoice); ?>
         <div class="row wpinv-top-content">
             <div class="col-xs-12 col-sm-6 wpinv-addresses">
                 <div class="col-xs-12 wpinv-address wpinv-from-address">
                     <?php wpinv_display_from_address(); ?>
                 </div>
                 <div class="col-xs-12 wpinv-address wpinv-to-address">
-                    <?php wpinv_display_to_address( $invoice_id ); ?>
+                    <?php wpinv_display_to_address($invoice_id); ?>
                 </div>
             </div>
             <div class="col-xs-12 col-sm-6 wpinv-details">
                 <div class="col-xs-12 wpinv-line-details">
-                    <?php do_action( 'wpinv_invoice_print_before_details', $invoice ); ?>
-                    <?php wpinv_display_invoice_details( $invoice ); ?>
-                    <?php do_action( 'wpinv_invoice_print_after_details', $invoice ); ?>
+                    <?php do_action('wpinv_invoice_print_before_details', $invoice); ?>
+                    <?php wpinv_display_invoice_details($invoice); ?>
+                    <?php do_action('wpinv_invoice_print_after_details', $invoice); ?>
                 </div>
             </div>
         </div>
-        <?php do_action( 'wpinv_invoice_print_after_top_content', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_after_top_content', $invoice); ?>
 
-        <?php do_action( 'wpinv_invoice_print_middle', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_middle', $invoice); ?>
         
-        <?php do_action( 'wpinv_invoice_print_before_line_items', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_before_line_items', $invoice); ?>
         <div class="row wpinv-items">
             <div class="col-sm-12 wpinv-line-items">
-                <?php wpinv_display_line_items( $invoice_id ); ?>
+                <?php wpinv_display_line_items($invoice_id); ?>
             </div>
         </div>
-        <?php do_action( 'wpinv_invoice_print_after_line_items', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_after_line_items', $invoice); ?>
         
         <!-- ///// Start PDF footer -->
         <htmlpagefooter name="wpinv-pdf-footer">
-            <?php do_action( 'wpinv_invoice_print_before_footer', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_before_footer', $invoice); ?>
             <div class="row wpinv-footer">
                 <div class="col-sm-12">
-                    <?php if ( $term_text = wpinv_get_terms_text() ) { ?>
-                    <div class="terms-text"><?php echo wpautop( $term_text ); ?></div>
+                    <?php if ($term_text = wpinv_get_terms_text()) { ?>
+                    <div class="terms-text"><?php echo wpautop($term_text); ?></div>
                     <?php } ?>
                     <div class="footer-text"><?php echo wpinv_get_business_footer(); ?></div>
-                    <div class="print-only"><?php _e( 'Page ', 'invoicing' ) ?> {PAGENO}/{nbpg}</div>
+                    <div class="print-only"><?php _e('Page ', 'invoicing') ?> {PAGENO}/{nbpg}</div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invoice_print_after_footer', $invoice ); ?>
+            <?php do_action('wpinv_invoice_print_after_footer', $invoice); ?>
         </htmlpagefooter>
         <!-- End PDF footer ///// -->
     </div><!-- END wpinv-wrap -->
-    <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
+    <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
 </body>
 </html>
\ No newline at end of file

Please login to merge, or discard this patch.

includes/wpinv-gd-functions.php 3 patches

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -976,67 +976,67 @@
 block discarded – undo
 function wpinv_tool_merge_fix_taxes() {
     global $wpdb;
     
-	$sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
-	$items = $wpdb->get_results( $sql );
+    $sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
+    $items = $wpdb->get_results( $sql );
 	
-	if ( !empty( $items ) ) {
-		foreach ( $items as $item ) {
-			if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
-				update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
-			}
-		}
-	}
+    if ( !empty( $items ) ) {
+        foreach ( $items as $item ) {
+            if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
+                update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
+            }
+        }
+    }
 		
     $sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
     $items = $wpdb->get_results( $sql );
 	
-	if ( !empty( $items ) ) {
-		$success = false;
+    if ( !empty( $items ) ) {
+        $success = false;
         $message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
 		
-		global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
+        global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
 		
-		foreach ( $items as $item ) {
-			$wpi_tax_rates = NULL;               
-			$data = wpinv_get_invoice($item->ID);
+        foreach ( $items as $item ) {
+            $wpi_tax_rates = NULL;               
+            $data = wpinv_get_invoice($item->ID);
 
-			if ( empty( $data ) ) {
-				continue;
-			}
+            if ( empty( $data ) ) {
+                continue;
+            }
 			
-			$checkout_session = wpinv_get_checkout_session();
+            $checkout_session = wpinv_get_checkout_session();
 			
-			$data_session                   = array();
-			$data_session['invoice_id']     = $data->ID;
-			$data_session['cart_discounts'] = $data->get_discounts( true );
+            $data_session                   = array();
+            $data_session['invoice_id']     = $data->ID;
+            $data_session['cart_discounts'] = $data->get_discounts( true );
 			
-			wpinv_set_checkout_session( $data_session );
+            wpinv_set_checkout_session( $data_session );
 			
-			$wpi_userID         = (int)$data->get_user_id();
-			$_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
+            $wpi_userID         = (int)$data->get_user_id();
+            $_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
 				
-			$data->country      = sanitize_text_field( $_POST['country'] );
-			$data->set( 'country', sanitize_text_field( $_POST['country'] ) );
+            $data->country      = sanitize_text_field( $_POST['country'] );
+            $data->set( 'country', sanitize_text_field( $_POST['country'] ) );
 			
-			$wpinv_ip_address_country = $data->country;
+            $wpinv_ip_address_country = $data->country;
 			
-			$data->recalculate_totals(true);
+            $data->recalculate_totals(true);
 			
-			wpinv_set_checkout_session( $checkout_session );
+            wpinv_set_checkout_session( $checkout_session );
 			
-			$update_data = array();
-			$update_data['tax_amount'] = $data->get_tax();
-			$update_data['paied_amount'] = $data->get_total();
-			$update_data['invoice_id'] = $data->ID;
+            $update_data = array();
+            $update_data['tax_amount'] = $data->get_tax();
+            $update_data['paied_amount'] = $data->get_total();
+            $update_data['invoice_id'] = $data->ID;
 			
-			$wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
-		}
-	} else {
+            $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
+        }
+    } else {
         $success = false;
         $message = __( 'No invoices found to fix taxes!', 'invoicing' );
     }
 	
-	$response = array();
+    $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
     wp_send_json( $response );

Please login to merge, or discard this patch.

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -740,6 +740,9 @@
 block discarded – undo
 add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
 remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
 
+/**
+ * @param string $new_status
+ */
 function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
     if (!defined('GEODIRPAYMENT_VERSION')) {
         return false;

Please login to merge, or discard this patch.

Spacing +266 added lines, -266 removed lines patch added patch discarded remove patch

@@ -1,23 +1,23 @@  discard block
 block discarded – undo
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_gd_active() {
-    return (bool)defined( 'GEODIRECTORY_VERSION' );
+    return (bool)defined('GEODIRECTORY_VERSION');
 }
 
 function wpinv_pm_active() {
-    return (bool)wpinv_gd_active() && (bool)defined( 'GEODIRPAYMENT_VERSION' );
+    return (bool)wpinv_gd_active() && (bool)defined('GEODIRPAYMENT_VERSION');
 }
 
-function wpinv_is_gd_post_type( $post_type ) {
+function wpinv_is_gd_post_type($post_type) {
     global $gd_posttypes;
     
-    $gd_posttypes = !empty( $gd_posttypes ) && is_array( $gd_posttypes ) ? $gd_posttypes : geodir_get_posttypes();
+    $gd_posttypes = !empty($gd_posttypes) && is_array($gd_posttypes) ? $gd_posttypes : geodir_get_posttypes();
     
-    if ( !empty( $post_type ) && !empty( $gd_posttypes ) && in_array( $post_type, $gd_posttypes ) ) {
+    if (!empty($post_type) && !empty($gd_posttypes) && in_array($post_type, $gd_posttypes)) {
         return true;
     }
     
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
         return;
     }
     
-    if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+    if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         // Add  fields for force upgrade
-        if ( defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column') ) {
-            geodir_add_column_if_not_exist( INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0' );
+        if (defined('INVOICE_TABLE') && !get_option('wpinv_gdp_column')) {
+            geodir_add_column_if_not_exist(INVOICE_TABLE, 'invoice_id', 'INT( 11 ) NOT NULL DEFAULT 0');
             
             update_option('wpinv_gdp_column', '1');
         }
@@ -40,39 +40,39 @@  discard block
 block discarded – undo
         wpinv_merge_gd_packages_to_items();
     }
 }
-add_action( 'admin_init', 'wpinv_geodir_integration' );
+add_action('admin_init', 'wpinv_geodir_integration');
 
-function wpinv_get_gdp_package_type( $item_types ) {
-    if ( wpinv_pm_active() ) {
-        $item_types['package'] = __( 'Package', 'invoicing' );
+function wpinv_get_gdp_package_type($item_types) {
+    if (wpinv_pm_active()) {
+        $item_types['package'] = __('Package', 'invoicing');
     }
         
     return $item_types;
 }
-add_filter( 'wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1 );
+add_filter('wpinv_get_item_types', 'wpinv_get_gdp_package_type', 10, 1);
 
 function wpinv_update_package_item($package_id) {
     return wpinv_merge_gd_package_to_item($package_id, true);
 }
 add_action('geodir_after_save_package', 'wpinv_update_package_item', 10, 1);
 
-function wpinv_merge_gd_packages_to_items( $force = false ) {    
-    if ( $merged = get_option( 'wpinv_merge_gd_packages' ) && !$force ) {
+function wpinv_merge_gd_packages_to_items($force = false) {    
+    if ($merged = get_option('wpinv_merge_gd_packages') && !$force) {
         return true;
     }
 
-    if(!function_exists('geodir_package_list_info')){
+    if (!function_exists('geodir_package_list_info')) {
         return false;
     }
     
     $packages = geodir_package_list_info();
     
-    foreach ( $packages as $key => $package ) {
-        wpinv_merge_gd_package_to_item( $package->pid, $force, $package );
+    foreach ($packages as $key => $package) {
+        wpinv_merge_gd_package_to_item($package->pid, $force, $package);
     }
     
-    if ( !$merged ) {
-        update_option( 'wpinv_merge_gd_packages', 1 );
+    if (!$merged) {
+        update_option('wpinv_merge_gd_packages', 1);
     }
     
     return true;
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 
     $package = empty($package) ? geodir_get_package_info_by_id($package_id, '') : $package;
 
-    if ( empty($package) || !wpinv_is_gd_post_type( $package->post_type ) ) {
+    if (empty($package) || !wpinv_is_gd_post_type($package->post_type)) {
         return false;
     }
         
@@ -110,17 +110,17 @@  discard block
 block discarded – undo
     $meta['custom_id']              = $package_id;
     $meta['custom_singular_name']   = get_post_type_singular_label($package->post_type);
     $meta['custom_name']            = get_post_type_plural_label($package->post_type);
-    $meta['price']                  = wpinv_round_amount( $package->amount );
+    $meta['price']                  = wpinv_round_amount($package->amount);
     $meta['vat_rule']               = 'digital';
     $meta['vat_class']              = '_standard';
     
-    if ( !empty( $package->sub_active ) ) {
-        $sub_num_trial_days = absint( $package->sub_num_trial_days );
+    if (!empty($package->sub_active)) {
+        $sub_num_trial_days = absint($package->sub_num_trial_days);
         
         $meta['is_recurring']       = 1;
         $meta['recurring_period']   = $package->sub_units;
-        $meta['recurring_interval'] = absint( $package->sub_units_num );
-        $meta['recurring_limit']    = absint( $package->sub_units_num_times );
+        $meta['recurring_interval'] = absint($package->sub_units_num);
+        $meta['recurring_limit']    = absint($package->sub_units_num_times);
         $meta['free_trial']         = $sub_num_trial_days > 0 ? 1 : 0;
         $meta['trial_period']       = $package->sub_num_trial_units;
         $meta['trial_interval']     = $sub_num_trial_days;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
         $meta['trial_interval']     = '';
     }
     
-    $data  = array( 
+    $data = array( 
         'post_title'    => $package->title,
         'post_excerpt'  => $package->title_desc,
         'post_status'   => $package->status == 1 ? 'publish' : 'pending',
@@ -151,48 +151,48 @@  discard block
 block discarded – undo
     return $item;
 }
 
-function wpinv_gdp_to_wpi_gateway( $payment_method ) {
-    switch( $payment_method ) {
+function wpinv_gdp_to_wpi_gateway($payment_method) {
+    switch ($payment_method) {
         case 'prebanktransfer':
             $gateway = 'bank_transfer';
         break;
         default:
-            $gateway = empty( $payment_method ) ? 'manual' : $payment_method;
+            $gateway = empty($payment_method) ? 'manual' : $payment_method;
         break;
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway', $gateway, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway', $gateway, $payment_method);
 }
 
-function wpinv_gdp_to_wpi_gateway_title( $payment_method ) {
-    $gateway = wpinv_gdp_to_wpi_gateway( $payment_method );
+function wpinv_gdp_to_wpi_gateway_title($payment_method) {
+    $gateway = wpinv_gdp_to_wpi_gateway($payment_method);
     
-    $gateway_title = wpinv_get_gateway_checkout_label( $gateway );
+    $gateway_title = wpinv_get_gateway_checkout_label($gateway);
     
-    if ( $gateway == $gateway_title ) {
-        $gateway_title = geodir_payment_method_title( $gateway );
+    if ($gateway == $gateway_title) {
+        $gateway_title = geodir_payment_method_title($gateway);
     }
     
-    return apply_filters( 'wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method );
+    return apply_filters('wpinv_gdp_to_wpi_gateway_title', $gateway_title, $payment_method);
 }
 
 function wpinv_print_checkout_errors() {
     global $wpi_session;
     wpinv_print_errors();
 }
-add_action( 'geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10 );
+add_action('geodir_checkout_page_content', 'wpinv_print_checkout_errors', -10);
 
-function wpinv_cpt_save( $invoice_id, $update = false, $pre_status = NULL ) {
+function wpinv_cpt_save($invoice_id, $update = false, $pre_status = NULL) {
     global $wpi_nosave, $wpi_zero_tax, $wpi_gdp_inv_merge;
     
-    $invoice_info = geodir_get_invoice( $invoice_id );
+    $invoice_info = geodir_get_invoice($invoice_id);
     
-    $wpi_invoice_id  = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : 0;
+    $wpi_invoice_id  = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : 0;
     
     if (!empty($invoice_info)) {
-        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice( $wpi_invoice_id ) : NULL;
+        $wpi_invoice = $wpi_invoice_id > 0 ? wpinv_get_invoice($wpi_invoice_id) : NULL;
         
-        if ( !empty( $wpi_invoice ) ) { // update invoice
+        if (!empty($wpi_invoice)) { // update invoice
             $save = false;
             if ($invoice_info->coupon_code !== $wpi_invoice->discount_code || (float)$invoice_info->discount < (float)$wpi_invoice->discount || (float)$invoice_info->discount > (float)$wpi_invoice->discount) {
                 $save = true;
@@ -202,16 +202,16 @@  discard block
 block discarded – undo
             
             if ($invoice_info->paymentmethod !== $wpi_invoice->gateway) {
                 $save = true;
-                $gateway = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-                $gateway = wpinv_gdp_to_wpi_gateway( $gateway );
-                $gateway_title = wpinv_gdp_to_wpi_gateway_title( $gateway );
-                $wpi_invoice->set('gateway', $gateway );
-                $wpi_invoice->set('gateway_title', $gateway_title );
+                $gateway = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+                $gateway = wpinv_gdp_to_wpi_gateway($gateway);
+                $gateway_title = wpinv_gdp_to_wpi_gateway_title($gateway);
+                $wpi_invoice->set('gateway', $gateway);
+                $wpi_invoice->set('gateway_title', $gateway_title);
             }
             
-            if ( ( $status = wpinv_gdp_to_wpi_status( $invoice_info->status ) ) !== $wpi_invoice->status ) {
+            if (($status = wpinv_gdp_to_wpi_status($invoice_info->status)) !== $wpi_invoice->status) {
                 $save = true;
-                $wpi_invoice->set( 'status', $status );
+                $wpi_invoice->set('status', $status);
             }
             
             if ($save) {
@@ -222,16 +222,16 @@  discard block
 block discarded – undo
             
             return $wpi_invoice;
         } else { // create invoice
-            $user_info = get_userdata( $invoice_info->user_id );
+            $user_info = get_userdata($invoice_info->user_id);
             
-            if ( !empty( $pre_status ) ) {
+            if (!empty($pre_status)) {
                 $invoice_info->status = $pre_status;
             }
-            $status = wpinv_gdp_to_wpi_status( $invoice_info->status );
+            $status = wpinv_gdp_to_wpi_status($invoice_info->status);
             
             $wpi_zero_tax = false;
             
-            if ( $wpi_gdp_inv_merge && in_array( $status, array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+            if ($wpi_gdp_inv_merge && in_array($status, array('publish', 'wpi-processing', 'wpi-renewal'))) {
                 $wpi_zero_tax = true;
             }
             
@@ -241,13 +241,13 @@  discard block
 block discarded – undo
             $invoice_data['user_id']        = $invoice_info->user_id;
             $invoice_data['created_via']    = 'API';
             
-            if ( !empty( $invoice_info->date ) ) {
-                $invoice_data['created_date']   = $invoice_info->date;
+            if (!empty($invoice_info->date)) {
+                $invoice_data['created_date'] = $invoice_info->date;
             }
             
-            $paymentmethod = !empty( $invoice_info->paymentmethod ) ? $invoice_info->paymentmethod : '';
-            $paymentmethod = wpinv_gdp_to_wpi_gateway( $paymentmethod );
-            $payment_method_title = wpinv_gdp_to_wpi_gateway_title( $paymentmethod );
+            $paymentmethod = !empty($invoice_info->paymentmethod) ? $invoice_info->paymentmethod : '';
+            $paymentmethod = wpinv_gdp_to_wpi_gateway($paymentmethod);
+            $payment_method_title = wpinv_gdp_to_wpi_gateway_title($paymentmethod);
             
             $invoice_data['payment_details'] = array( 
                 'gateway'           => $paymentmethod, 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
                 'currency'          => geodir_get_currency_type(),
             );
             
-            $user_address = wpinv_get_user_address( $invoice_info->user_id, false );
+            $user_address = wpinv_get_user_address($invoice_info->user_id, false);
             
             $invoice_data['user_info'] = array( 
                 'user_id'       => $invoice_info->user_id, 
@@ -278,14 +278,14 @@  discard block
 block discarded – undo
             
             $post_item = wpinv_get_gd_package_item($invoice_info->package_id);
 
-            if ( $invoice_info->invoice_type == 'add_franchise' ) {
+            if ($invoice_info->invoice_type == 'add_franchise') {
                 $custom_price = $invoice_info->amount;
             } else {
                 $custom_price = '';
             }
 
-            if ( !empty( $post_item ) ) {
-                $cart_details  = array();
+            if (!empty($post_item)) {
+                $cart_details = array();
                 $cart_details[] = array(
                     'id'            => $post_item->ID,
                     'name'          => $post_item->get_name(),
@@ -299,19 +299,19 @@  discard block
 block discarded – undo
                     ),
                 );
                 
-                $invoice_data['cart_details']  = $cart_details;
+                $invoice_data['cart_details'] = $cart_details;
             }
 
-            $data = array( 'invoice' => $invoice_data );
+            $data = array('invoice' => $invoice_data);
 
             $wpinv_api = new WPInv_API();
-            $data = $wpinv_api->insert_invoice( $data );
+            $data = $wpinv_api->insert_invoice($data);
             
-            if ( is_wp_error( $data ) ) {
-                wpinv_error_log( 'WPInv_Invoice: ' . $data->get_error_message() );
+            if (is_wp_error($data)) {
+                wpinv_error_log('WPInv_Invoice: ' . $data->get_error_message());
             } else {
-                if ( !empty( $data ) ) {
-                    update_post_meta( $data->ID, '_wpinv_gdp_id', $invoice_id );
+                if (!empty($data)) {
+                    update_post_meta($data->ID, '_wpinv_gdp_id', $invoice_id);
                     
                     $update_data = array();
                     $update_data['tax_amount'] = $data->get_tax();
@@ -319,14 +319,14 @@  discard block
 block discarded – undo
                     $update_data['invoice_id'] = $data->ID;
                     
                     global $wpdb;
-                    $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $invoice_id ) );
+                    $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $invoice_id));
                     
                     return $data;
                 } else {
-                    if ( $update ) {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to update invoice.', 'invoicing' ) );
+                    if ($update) {
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to update invoice.', 'invoicing'));
                     } else {
-                        wpinv_error_log( 'WPInv_Invoice: ' . __( 'Fail to create invoice.', 'invoicing' ) );
+                        wpinv_error_log('WPInv_Invoice: ' . __('Fail to create invoice.', 'invoicing'));
                     }
                 }
             }
@@ -337,59 +337,59 @@  discard block
 block discarded – undo
 }
 add_action('geodir_payment_invoice_created', 'wpinv_cpt_save', 11, 3);
 
-function wpinv_cpt_update( $invoice_id ) {
-    return wpinv_cpt_save( $invoice_id, true );
+function wpinv_cpt_update($invoice_id) {
+    return wpinv_cpt_save($invoice_id, true);
 }
 add_action('geodir_payment_invoice_updated', 'wpinv_cpt_update', 11, 1);
 
-function wpinv_payment_status_changed( $invoice_id, $new_status, $old_status = 'pending', $subscription = false ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_payment_status_changed($invoice_id, $new_status, $old_status = 'pending', $subscription = false) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $invoice = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
-    if ( !empty( $invoice ) ) {
+    $invoice = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
+    if (!empty($invoice)) {
         $new_status = wpinv_gdp_to_wpi_status($new_status);
-        $invoice    = wpinv_update_payment_status( $invoice->ID, $new_status );
+        $invoice    = wpinv_update_payment_status($invoice->ID, $new_status);
     } else {
-        $invoice = wpinv_cpt_save( $invoice_id );
+        $invoice = wpinv_cpt_save($invoice_id);
     }
     
     return $invoice;
 }
-add_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+add_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
 
-function wpinv_transaction_details_note( $invoice_id, $html ) {
-    $invoice_info = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice_info ) ) {
+function wpinv_transaction_details_note($invoice_id, $html) {
+    $invoice_info = geodir_get_invoice($invoice_id);
+    if (empty($invoice_info)) {
         return false;
     }
 
-    $wpi_invoice_id = !empty( $invoice_info->invoice_id ) ? $invoice_info->invoice_id : NULL;
+    $wpi_invoice_id = !empty($invoice_info->invoice_id) ? $invoice_info->invoice_id : NULL;
     
-    if ( !$wpi_invoice_id ) {
-        $invoice = wpinv_cpt_save( $invoice_id, false, $old_status );
+    if (!$wpi_invoice_id) {
+        $invoice = wpinv_cpt_save($invoice_id, false, $old_status);
         
-        if ( !empty( $invoice ) ) {
+        if (!empty($invoice)) {
             $wpi_invoice_id = $invoice->ID;
         }
     }
 
-    $invoice = wpinv_get_invoice( $wpi_invoice_id );
+    $invoice = wpinv_get_invoice($wpi_invoice_id);
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
     
-    return $invoice->add_note( $html, true );
+    return $invoice->add_note($html, true);
 }
-add_action( 'geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2 );
+add_action('geodir_payment_invoice_transaction_details_changed', 'wpinv_transaction_details_note', 11, 2);
 
-function wpinv_gdp_to_wpi_status( $status ) {
+function wpinv_gdp_to_wpi_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'confirmed':
             $inv_status = 'publish';
         break;
@@ -409,10 +409,10 @@  discard block
 block discarded – undo
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_status( $status ) {
+function wpinv_wpi_to_gdp_status($status) {
     $inv_status = $status ? $status : 'pending';
     
-    switch ( $status ) {
+    switch ($status) {
         case 'publish':
         case 'wpi-processing':
         case 'wpi-renewal':
@@ -435,72 +435,72 @@  discard block
 block discarded – undo
     return $inv_status;
 }
 
-function wpinv_wpi_to_gdp_id( $invoice_id ) {
+function wpinv_wpi_to_gdp_id($invoice_id) {
     global $wpdb;
     
-    return $wpdb->get_var( $wpdb->prepare( "SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array( (int)$invoice_id ) ) );
+    return $wpdb->get_var($wpdb->prepare("SELECT `id` FROM `" . INVOICE_TABLE . "` WHERE `invoice_id` = %d AND `invoice_id` > 0 ORDER BY id DESC LIMIT 1", array((int)$invoice_id)));
 }
 
-function wpinv_gdp_to_wpi_id( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );    
-    return ( empty( $invoice->invoice_id ) ? $invoice->invoice_id : false);
+function wpinv_gdp_to_wpi_id($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);    
+    return (empty($invoice->invoice_id) ? $invoice->invoice_id : false);
 }
 
-function wpinv_to_gdp_recalculate_total( $invoice, $wpi_nosave ) {
+function wpinv_to_gdp_recalculate_total($invoice, $wpi_nosave) {
     global $wpdb;
     
-    if ( !empty( $wpi_nosave ) ) {
+    if (!empty($wpi_nosave)) {
         return;
     }
     
-    $gdp_invoice_id = wpinv_wpi_to_gdp_id( $invoice->ID );
+    $gdp_invoice_id = wpinv_wpi_to_gdp_id($invoice->ID);
     
-    if ( $gdp_invoice_id > 0 ) {
+    if ($gdp_invoice_id > 0) {
         $update_data = array();
         $update_data['tax_amount']      = $invoice->tax;
         $update_data['paied_amount']    = $invoice->total;
         $update_data['discount']        = $invoice->discount;
         $update_data['coupon_code']     = $invoice->discount_code;
         
-        $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $gdp_invoice_id ) );
+        $wpdb->update(INVOICE_TABLE, $update_data, array('id' => $gdp_invoice_id));
     }
     
     return;
 }
 //add_action( 'wpinv_invoice_recalculate_total', 'wpinv_to_gdp_recalculate_total', 10, 2 );
 
-function wpinv_gdp_to_wpi_invoice( $invoice_id ) {
-    $invoice = geodir_get_invoice( $invoice_id );
-    if ( empty( $invoice->invoice_id ) ) {
+function wpinv_gdp_to_wpi_invoice($invoice_id) {
+    $invoice = geodir_get_invoice($invoice_id);
+    if (empty($invoice->invoice_id)) {
         return false;
     }
     
-    return wpinv_get_invoice( $invoice->invoice_id );
+    return wpinv_get_invoice($invoice->invoice_id);
 }
 
-function wpinv_payment_set_coupon_code( $status, $invoice_id, $coupon_code ) {
-    $invoice = wpinv_gdp_to_wpi_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+function wpinv_payment_set_coupon_code($status, $invoice_id, $coupon_code) {
+    $invoice = wpinv_gdp_to_wpi_invoice($invoice_id);
+    if (empty($invoice)) {
         return $status;
     }
 
-    if ( $status === 1 || $status === 0 ) {
-        if ( $status === 1 ) {
-            $discount = geodir_get_discount_amount( $coupon_code, $invoice->get_subtotal() );
+    if ($status === 1 || $status === 0) {
+        if ($status === 1) {
+            $discount = geodir_get_discount_amount($coupon_code, $invoice->get_subtotal());
         } else {
             $discount = '';
             $coupon_code = '';
         }
         
-        $invoice->set( 'discount', $discount );
-        $invoice->set( 'discount_code', $coupon_code );
+        $invoice->set('discount', $discount);
+        $invoice->set('discount_code', $coupon_code);
         $invoice->save();
         $invoice->recalculate_total();
     }
     
     return $status;
 }
-add_filter( 'geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3 );
+add_filter('geodir_payment_set_coupon_code', 'wpinv_payment_set_coupon_code', 10, 3);
 
 function wpinv_merge_gd_invoices() {
     if (!defined('GEODIRPAYMENT_VERSION')) {
@@ -508,157 +508,157 @@  discard block
 block discarded – undo
     }
     ?>
     <tr>
-        <td><?php _e( 'Merge Price Packages', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Price Packages', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager price packages to the Invoicing items.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_packages" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager invoices to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_invoices" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
 	<tr>
-        <td><?php _e( 'Fix Taxes for Merged Invoices', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Fix Taxes for Merged Invoices', 'invoicing'); ?></td>
+        <td><p><?php _e('Fix taxes for NON-PAID invoices which are merged before, from GeoDirectory Payment Manager invoices to Invoicing. This will recalculate taxes for non-paid merged invoices.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_fix_taxes" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <tr>
-        <td><?php _e( 'Merge Coupons', 'invoicing' ); ?></td>
-        <td><p><?php _e( 'Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing' ); ?></p></td>
-        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e( 'Run', 'invoicing' ); ?>"></td>
+        <td><?php _e('Merge Coupons', 'invoicing'); ?></td>
+        <td><p><?php _e('Merge GeoDirectory Payment Manager coupons to the Invoicing.', 'invoicing'); ?></p></td>
+        <td><input type="button" data-tool="merge_coupons" class="button-primary wpinv-tool" value="<?php esc_attr_e('Run', 'invoicing'); ?>"></td>
     </tr>
     <?php
 }
-add_action( 'wpinv_tools_row', 'wpinv_merge_gd_invoices', 10 );
+add_action('wpinv_tools_row', 'wpinv_merge_gd_invoices', 10);
 
 function wpinv_tool_merge_packages() {
     $packages = geodir_package_list_info();
     
     $count = 0;
     
-    if ( !empty( $packages ) ) {
+    if (!empty($packages)) {
         $success = true;
         
-        foreach ( $packages as $key => $package ) {
+        foreach ($packages as $key => $package) {
             $item = wpinv_get_item_by('custom_id', $package->pid, 'package');
-            if ( !empty( $item ) ) {
+            if (!empty($item)) {
                 continue;
             }
             
-            $merged = wpinv_merge_gd_package_to_item( $package->pid, false, $package );
+            $merged = wpinv_merge_gd_package_to_item($package->pid, false, $package);
             
-            if ( !empty( $merged ) ) {
-                wpinv_error_log( 'Package merge S : ' . $package->pid );
+            if (!empty($merged)) {
+                wpinv_error_log('Package merge S : ' . $package->pid);
                 $count++;
             } else {
-                wpinv_error_log( 'Package merge F : ' . $package->pid );
+                wpinv_error_log('Package merge F : ' . $package->pid);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> price package is merged successfully.', 'Total <b>%d</b> price packages are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No price packages merged.', 'invoicing' );
+            $message = __('No price packages merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No price packages found to merge!', 'invoicing' );
+        $message = __('No price packages found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_packages', 'wpinv_tool_merge_packages' );
+add_action('wpinv_tool_merge_packages', 'wpinv_tool_merge_packages');
 
 function wpinv_tool_merge_invoices() {
     global $wpdb, $wpi_gdp_inv_merge, $wpi_tax_rates;
     
     $sql = "SELECT `gdi`.`id`, `gdi`.`date`, `gdi`.`date_updated` FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NULL ORDER BY `gdi`.`id` ASC";
 
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         $wpi_gdp_inv_merge = true;
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $wpi_tax_rates = NULL;
             
-            $wpdb->query( "UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'" );
+            $wpdb->query("UPDATE `" . INVOICE_TABLE . "` SET `invoice_id` = 0 WHERE id = '" . $item->id . "'");
             
-            $merged = wpinv_cpt_save( $item->id );
+            $merged = wpinv_cpt_save($item->id);
             
-            if ( !empty( $merged ) && !empty( $merged->ID ) ) {
+            if (!empty($merged) && !empty($merged->ID)) {
                 $count++;
                 
-                $post_date = !empty( $item->date ) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time( 'mysql' );
-                $post_date_gmt = get_gmt_from_date( $post_date );
-                $post_modified = !empty( $item->date_updated ) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
-                $post_modified_gmt = get_gmt_from_date( $post_modified );
+                $post_date = !empty($item->date) && $item->date != '0000-00-00 00:00:00' ? $item->date : current_time('mysql');
+                $post_date_gmt = get_gmt_from_date($post_date);
+                $post_modified = !empty($item->date_updated) && $item->date_updated != '0000-00-00 00:00:00' ? $item->date_updated : $post_date;
+                $post_modified_gmt = get_gmt_from_date($post_modified);
                 
-                $wpdb->update( $wpdb->posts, array( 'post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt ), array( 'ID' => $merged->ID ) );
+                $wpdb->update($wpdb->posts, array('post_date' => $post_date, 'post_date_gmt' => $post_date_gmt, 'post_modified' => $post_modified, 'post_modified_gmt' => $post_modified_gmt), array('ID' => $merged->ID));
                 
-                if ( $merged->is_paid() ) {
-                    update_post_meta( $merged->ID, '_wpinv_completed_date', $post_modified );
+                if ($merged->is_paid()) {
+                    update_post_meta($merged->ID, '_wpinv_completed_date', $post_modified);
                 }
                 
-                clean_post_cache( $merged->ID );
+                clean_post_cache($merged->ID);
                 
-                wpinv_error_log( 'Invoice merge S : ' . $item->id . ' => ' . $merged->ID );
+                wpinv_error_log('Invoice merge S : ' . $item->id . ' => ' . $merged->ID);
             } else {
-                wpinv_error_log( 'Invoice merge F : ' . $item->id );
+                wpinv_error_log('Invoice merge F : ' . $item->id);
             }
         }
         
         $wpi_gdp_inv_merge = false;
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> invoice is merged successfully.', 'Total <b>%d</b> invoices are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No invoices merged.', 'invoicing' );
+            $message = __('No invoices merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No invoices found to merge!', 'invoicing' );
+        $message = __('No invoices found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices' );
+add_action('wpinv_tool_merge_invoices', 'wpinv_tool_merge_invoices');
 
 function wpinv_tool_merge_coupons() {
     global $wpdb;
     
     $sql = "SELECT * FROM `" . COUPON_TABLE . "` WHERE `coupon_code` IS NOT NULL AND `coupon_code` != '' ORDER BY `cid` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
     $count = 0;
     
-    if ( !empty( $items ) ) {
+    if (!empty($items)) {
         $success = true;
         
-        foreach ( $items as $item ) {
-            if ( wpinv_get_discount_by_code( $item->coupon_code ) ) {
+        foreach ($items as $item) {
+            if (wpinv_get_discount_by_code($item->coupon_code)) {
                 continue;
             }
             
             $args = array(
                 'post_type'   => 'wpi_discount',
                 'post_title'  => $item->coupon_code,
-                'post_status' => !empty( $item->status ) ? 'publish' : 'pending'
+                'post_status' => !empty($item->status) ? 'publish' : 'pending'
             );
 
-            $merged = wp_insert_post( $args );
+            $merged = wp_insert_post($args);
             
             $item_id = $item->cid;
             
-            if ( $merged ) {
+            if ($merged) {
                 $meta = array(
                     'code'              => $item->coupon_code,
                     'type'              => $item->discount_type != 'per' ? 'flat' : 'percent',
@@ -666,65 +666,65 @@  discard block
 block discarded – undo
                     'max_uses'          => (int)$item->usage_limit,
                     'uses'              => (int)$item->usage_count,
                 );
-                wpinv_store_discount( $merged, $meta, get_post( $merged ) );
+                wpinv_store_discount($merged, $meta, get_post($merged));
                 
                 $count++;
                 
-                wpinv_error_log( 'Coupon merge S : ' . $item_id . ' => ' . $merged );
+                wpinv_error_log('Coupon merge S : ' . $item_id . ' => ' . $merged);
             } else {
-                wpinv_error_log( 'Coupon merge F : ' . $item_id );
+                wpinv_error_log('Coupon merge F : ' . $item_id);
             }
         }
         
-        if ( $count > 0 ) {
-            $message = sprintf( _n( 'Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing' ), $count );
+        if ($count > 0) {
+            $message = sprintf(_n('Total <b>%d</b> coupon is merged successfully.', 'Total <b>%d</b> coupons are merged successfully.', $count, 'invoicing'), $count);
         } else {
-            $message = __( 'No coupons merged.', 'invoicing' );
+            $message = __('No coupons merged.', 'invoicing');
         }
     } else {
         $success = false;
-        $message = __( 'No coupons found to merge!', 'invoicing' );
+        $message = __('No coupons found to merge!', 'invoicing');
     }
     
     $response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons' );
+add_action('wpinv_tool_merge_coupons', 'wpinv_tool_merge_coupons');
 
-function wpinv_gdp_to_wpi_currency( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency($value, $option = '') {
     return wpinv_get_currency();
 }
-add_filter( 'pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2 );
+add_filter('pre_option_geodir_currency', 'wpinv_gdp_to_wpi_currency', 10, 2);
 
-function wpinv_gdp_to_wpi_currency_sign( $value, $option = '' ) {
+function wpinv_gdp_to_wpi_currency_sign($value, $option = '') {
     return wpinv_currency_symbol();
 }
-add_filter( 'pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2 );
+add_filter('pre_option_geodir_currencysym', 'wpinv_gdp_to_wpi_currency_sign', 10, 2);
 
-function wpinv_gdp_to_wpi_display_price( $price, $amount, $display = true , $decimal_sep, $thousand_sep ) {
-    if ( !$display ) {
-        $price = wpinv_round_amount( $amount );
+function wpinv_gdp_to_wpi_display_price($price, $amount, $display = true, $decimal_sep, $thousand_sep) {
+    if (!$display) {
+        $price = wpinv_round_amount($amount);
     } else {
-        $price = wpinv_price( wpinv_format_amount( $amount ) );
+        $price = wpinv_price(wpinv_format_amount($amount));
     }
     
     return $price;
 }
-add_filter( 'geodir_payment_price' , 'wpinv_gdp_to_wpi_display_price', 10000, 5 );
+add_filter('geodir_payment_price', 'wpinv_gdp_to_wpi_display_price', 10000, 5);
 
-function wpinv_gdp_to_inv_checkout_redirect( $redirect_url ) {
+function wpinv_gdp_to_inv_checkout_redirect($redirect_url) {
     $invoice_id         = geodir_payment_cart_id();
-    $invoice_info       = geodir_get_invoice( $invoice_id );
-    $wpi_invoice        = !empty( $invoice_info->invoice_id ) ? wpinv_get_invoice( $invoice_info->invoice_id ) : NULL;
+    $invoice_info       = geodir_get_invoice($invoice_id);
+    $wpi_invoice        = !empty($invoice_info->invoice_id) ? wpinv_get_invoice($invoice_info->invoice_id) : NULL;
     
-    if ( !( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) ) {
-        $wpi_invoice_id = wpinv_cpt_save( $invoice_id );
-        $wpi_invoice    = wpinv_get_invoice( $wpi_invoice_id );
+    if (!(!empty($wpi_invoice) && !empty($wpi_invoice->ID))) {
+        $wpi_invoice_id = wpinv_cpt_save($invoice_id);
+        $wpi_invoice    = wpinv_get_invoice($wpi_invoice_id);
     }
     
-    if ( !empty( $wpi_invoice ) && !empty( $wpi_invoice->ID ) ) {
+    if (!empty($wpi_invoice) && !empty($wpi_invoice->ID)) {
         
         // Clear cart
         geodir_payment_clear_cart();
@@ -734,121 +734,121 @@  discard block
 block discarded – undo
     
     return $redirect_url;
 }
-add_filter( 'geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1 );
+add_filter('geodir_payment_checkout_redirect_url', 'wpinv_gdp_to_inv_checkout_redirect', 100, 1);
 
-function wpinv_gdp_dashboard_invoice_history_link( $dashboard_links ) {    
-    if ( get_current_user_id() ) {        
-        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url( wpinv_get_history_page_uri() ) . '">' . __( 'My Invoice History', 'invoicing' ) . '</a></li>';
+function wpinv_gdp_dashboard_invoice_history_link($dashboard_links) {    
+    if (get_current_user_id()) {        
+        $dashboard_links .= '<li><i class="fa fa-shopping-cart"></i><a class="gd-invoice-link" href="' . esc_url(wpinv_get_history_page_uri()) . '">' . __('My Invoice History', 'invoicing') . '</a></li>';
     }
 
     return $dashboard_links;
 }
-add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
-remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
+add_action('geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link');
+remove_action('geodir_dashboard_links', 'geodir_payment_invoices_list_page_link');
 
-function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
+function wpinv_wpi_to_gdp_update_status($invoice_id, $new_status, $old_status) {
     if (!defined('GEODIRPAYMENT_VERSION')) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    remove_action( 'geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4 );
+    remove_action('geodir_payment_invoice_status_changed', 'wpinv_payment_status_changed', 11, 4);
     
-    $invoice_id = wpinv_wpi_to_gdp_id( $invoice_id );
-    $new_status = wpinv_wpi_to_gdp_status( $new_status );
+    $invoice_id = wpinv_wpi_to_gdp_id($invoice_id);
+    $new_status = wpinv_wpi_to_gdp_status($new_status);
     
-    geodir_update_invoice_status( $invoice_id, $new_status, $invoice->is_recurring() );
+    geodir_update_invoice_status($invoice_id, $new_status, $invoice->is_recurring());
 }
-add_action( 'wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3 );
+add_action('wpinv_update_status', 'wpinv_wpi_to_gdp_update_status', 999, 3);
 
-function wpinv_gdp_to_wpi_delete_package( $gd_package_id ) {
-    $item = wpinv_get_item_by( 'custom_id', $gd_package_id, 'package' );
+function wpinv_gdp_to_wpi_delete_package($gd_package_id) {
+    $item = wpinv_get_item_by('custom_id', $gd_package_id, 'package');
     
-    if ( !empty( $item ) ) {
-        wpinv_remove_item( $item, true );
+    if (!empty($item)) {
+        wpinv_remove_item($item, true);
     }
 }
-add_action( 'geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1 ) ;
+add_action('geodir_payment_post_delete_package', 'wpinv_gdp_to_wpi_delete_package', 10, 1);
 
-function wpinv_can_delete_package_item( $return, $post_id ) {
-    if ( $return && function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && $package_id = get_post_meta( $post_id, '_wpinv_custom_id', true ) ) {
-        $gd_package = geodir_get_package_info_by_id( $package_id, '' );
+function wpinv_can_delete_package_item($return, $post_id) {
+    if ($return && function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && $package_id = get_post_meta($post_id, '_wpinv_custom_id', true)) {
+        $gd_package = geodir_get_package_info_by_id($package_id, '');
         
-        if ( !empty( $gd_package ) ) {
+        if (!empty($gd_package)) {
             $return = false;
         }
     }
 
     return $return;
 }
-add_filter( 'wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2 );
+add_filter('wpinv_can_delete_item', 'wpinv_can_delete_package_item', 10, 2);
 
-function wpinv_package_item_classes( $classes, $class, $post_id ) {
+function wpinv_package_item_classes($classes, $class, $post_id) {
     global $typenow;
 
-    if ( $typenow == 'wpi_item' && in_array( 'wpi-gd-package', $classes ) ) {
-        if ( wpinv_item_in_use( $post_id ) ) {
+    if ($typenow == 'wpi_item' && in_array('wpi-gd-package', $classes)) {
+        if (wpinv_item_in_use($post_id)) {
             $classes[] = 'wpi-inuse-pkg';
-        } else if ( !( function_exists( 'geodir_get_package_info_by_id' ) && get_post_meta( $post_id, '_wpinv_type', true ) == 'package' && geodir_get_package_info_by_id( (int)get_post_meta( $post_id, '_wpinv_custom_id', true ), '' ) ) ) {
+        } else if (!(function_exists('geodir_get_package_info_by_id') && get_post_meta($post_id, '_wpinv_type', true) == 'package' && geodir_get_package_info_by_id((int)get_post_meta($post_id, '_wpinv_custom_id', true), ''))) {
             $classes[] = 'wpi-delete-pkg';
         }
     }
 
     return $classes;
 }
-add_filter( 'post_class', 'wpinv_package_item_classes', 10, 3 );
+add_filter('post_class', 'wpinv_package_item_classes', 10, 3);
 
-function wpinv_gdp_package_type_info( $post ) {
-    if ( wpinv_pm_active() ) {
-        ?><p class="wpi-m0"><?php _e( 'Package: GeoDirectory price packages items.', 'invoicing' );?></p>
+function wpinv_gdp_package_type_info($post) {
+    if (wpinv_pm_active()) {
+        ?><p class="wpi-m0"><?php _e('Package: GeoDirectory price packages items.', 'invoicing'); ?></p>
         <?php
     }
 }
-add_action( 'wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1 ) ;
+add_action('wpinv_item_info_metabox_after', 'wpinv_gdp_package_type_info', 10, 1);
 
-function wpinv_gdp_to_gdi_set_zero_tax( $is_taxable, $item_id, $country , $state ) {
+function wpinv_gdp_to_gdi_set_zero_tax($is_taxable, $item_id, $country, $state) {
     global $wpi_zero_tax;
 
-    if ( $wpi_zero_tax ) {
+    if ($wpi_zero_tax) {
         $is_taxable = false;
     }
 
     return $is_taxable;
 }
-add_action( 'wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4 ) ;
+add_action('wpinv_item_is_taxable', 'wpinv_gdp_to_gdi_set_zero_tax', 10, 4);
 
 function wpinv_tool_merge_fix_taxes() {
     global $wpdb;
     
 	$sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
-	$items = $wpdb->get_results( $sql );
+	$items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
-		foreach ( $items as $item ) {
-			if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
-				update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
+	if (!empty($items)) {
+		foreach ($items as $item) {
+			if (get_post_meta($item->ID, '_wpinv_vat_class', true) == '_exempt') {
+				update_post_meta($item->ID, '_wpinv_vat_class', '_standard');
 			}
 		}
 	}
 		
     $sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
-    $items = $wpdb->get_results( $sql );
+    $items = $wpdb->get_results($sql);
 	
-	if ( !empty( $items ) ) {
+	if (!empty($items)) {
 		$success = false;
-        $message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
+        $message = __('Taxes fixed for non-paid merged GD invoices.', 'invoicing');
 		
 		global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
 		
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 			$wpi_tax_rates = NULL;               
 			$data = wpinv_get_invoice($item->ID);
 
-			if ( empty( $data ) ) {
+			if (empty($data)) {
 				continue;
 			}
 			
@@ -856,51 +856,51 @@  discard block
 block discarded – undo
 			
 			$data_session                   = array();
 			$data_session['invoice_id']     = $data->ID;
-			$data_session['cart_discounts'] = $data->get_discounts( true );
+			$data_session['cart_discounts'] = $data->get_discounts(true);
 			
-			wpinv_set_checkout_session( $data_session );
+			wpinv_set_checkout_session($data_session);
 			
 			$wpi_userID         = (int)$data->get_user_id();
 			$_POST['country']   = !empty($data->country) ? $data->country : wpinv_get_default_country();
 				
-			$data->country      = sanitize_text_field( $_POST['country'] );
-			$data->set( 'country', sanitize_text_field( $_POST['country'] ) );
+			$data->country      = sanitize_text_field($_POST['country']);
+			$data->set('country', sanitize_text_field($_POST['country']));
 			
 			$wpinv_ip_address_country = $data->country;
 			
 			$data->recalculate_totals(true);
 			
-			wpinv_set_checkout_session( $checkout_session );
+			wpinv_set_checkout_session($checkout_session);
 			
 			$update_data = array();
 			$update_data['tax_amount'] = $data->get_tax();
 			$update_data['paied_amount'] = $data->get_total();
 			$update_data['invoice_id'] = $data->ID;
 			
-			$wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
+			$wpdb->update(INVOICE_TABLE, $update_data, array('id' => $item->gdp_id));
 		}
 	} else {
         $success = false;
-        $message = __( 'No invoices found to fix taxes!', 'invoicing' );
+        $message = __('No invoices found to fix taxes!', 'invoicing');
     }
 	
 	$response = array();
     $response['success'] = $success;
     $response['data']['message'] = $message;
-    wp_send_json( $response );
+    wp_send_json($response);
 }
-add_action( 'wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes' );
-remove_action( 'geodir_before_detail_fields' , 'geodir_build_coupon', 2 );
+add_action('wpinv_tool_merge_fix_taxes', 'wpinv_tool_merge_fix_taxes');
+remove_action('geodir_before_detail_fields', 'geodir_build_coupon', 2);
 
-function wpinv_wpi_to_gdp_handle_subscription_cancel( $invoice_id, $invoice ) {
-    if ( wpinv_pm_active() && !empty( $invoice ) && $invoice->is_recurring() ) {
-        if ( $invoice->is_renewal() ) {
+function wpinv_wpi_to_gdp_handle_subscription_cancel($invoice_id, $invoice) {
+    if (wpinv_pm_active() && !empty($invoice) && $invoice->is_recurring()) {
+        if ($invoice->is_renewal()) {
             $invoice = $invoice->get_parent_payment();
         }
         
-        if ( !empty( $invoice ) ) {
-            wpinv_wpi_to_gdp_update_status( $invoice->ID, 'wpi-cancelled', $invoice->get_status() );
+        if (!empty($invoice)) {
+            wpinv_wpi_to_gdp_update_status($invoice->ID, 'wpi-cancelled', $invoice->get_status());
         }
     }
 }
-add_action( 'wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2 );
\ No newline at end of file
+add_action('wpinv_subscription_cancelled', 'wpinv_wpi_to_gdp_handle_subscription_cancel', 10, 2);
\ No newline at end of file

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
 <?php
-function wpinv_get_subscriptions( $args = array() ) {
-    if ( empty( $args['parent_invoice_id'] ) ) {
+function wpinv_get_subscriptions($args = array()) {
+    if (empty($args['parent_invoice_id'])) {
         return false;
     }
     
@@ -14,18 +14,18 @@  discard block
 block discarded – undo
     );
 
     $args['post_parent']    = $args['parent_invoice_id'];
-    $args                   = wp_parse_args( $args, $defaults );
+    $args                   = wp_parse_args($args, $defaults);
 
-    if( $args['numberposts'] < 1 ) {
+    if ($args['numberposts'] < 1) {
         $args['numberposts'] = 999999999999;
     }
 
-    $posts          = get_posts( $args );
+    $posts          = get_posts($args);
     $subscriptions  = array();
-    if ( !empty( $posts ) ) {
-        foreach ( $posts as $post ) {
-            if ( !empty( $post->ID ) ) {
-                $subscriptions[] = wpinv_get_invoice( $post->ID );
+    if (!empty($posts)) {
+        foreach ($posts as $post) {
+            if (!empty($post->ID)) {
+                $subscriptions[] = wpinv_get_invoice($post->ID);
             }
         }
     }
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
     
     return $subscriptions;
 }
-function wpinv_get_subscription( $id = 0, $by_profile_id = false ) {
+function wpinv_get_subscription($id = 0, $by_profile_id = false) {
     global $wpdb;
 
-    if ( empty( $id ) ) {
+    if (empty($id)) {
         return false;
     }
 
-    $id = esc_sql( $id );
+    $id = esc_sql($id);
 
-    $invoice_id = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1" );
+    $invoice_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_profile_id' AND meta_value = '{$id}' LIMIT 1");
 
-    if ( $invoice_id != null ) {
-        return wpinv_get_invoice( $invoice_id );
+    if ($invoice_id != null) {
+        return wpinv_get_invoice($invoice_id);
     }
 
     return false;
@@ -55,49 +55,49 @@  discard block
 block discarded – undo
  * Records a new payment on the subscription
  * 
  */
-function wpinv_recurring_add_subscription_payment( $parent_invoice_id, $subscription_args = array() ) {    
-    $args = wp_parse_args( $subscription_args, array(
+function wpinv_recurring_add_subscription_payment($parent_invoice_id, $subscription_args = array()) {    
+    $args = wp_parse_args($subscription_args, array(
         'amount'         => '',
         'transaction_id' => '',
         'gateway'        => ''
-    ) );
+    ));
 
-    if ( wpinv_payment_exists( $args['transaction_id'] ) ) {
+    if (wpinv_payment_exists($args['transaction_id'])) {
         return false;
     }
     
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $parent_invoice ) ) {
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($parent_invoice)) {
         return;
     }
 
     $invoice = new WPInv_Invoice();
-    $invoice->set( 'parent_invoice', $parent_invoice_id );
-    $invoice->set( 'currency', $parent_invoice->get_currency() );
+    $invoice->set('parent_invoice', $parent_invoice_id);
+    $invoice->set('currency', $parent_invoice->get_currency());
     //$invoice->set( 'status', 'publish' );
-    $invoice->set( 'transaction_id', $args['transaction_id'] );
-    $invoice->set( 'key', $parent_invoice->get_key() );
+    $invoice->set('transaction_id', $args['transaction_id']);
+    $invoice->set('key', $parent_invoice->get_key());
     
-    $invoice->set( 'ip', $parent_invoice->ip );
-    $invoice->set( 'user_id', $parent_invoice->get_user_id() );
-    $invoice->set( 'first_name', $parent_invoice->get_first_name() );
-    $invoice->set( 'last_name', $parent_invoice->get_last_name() );
+    $invoice->set('ip', $parent_invoice->ip);
+    $invoice->set('user_id', $parent_invoice->get_user_id());
+    $invoice->set('first_name', $parent_invoice->get_first_name());
+    $invoice->set('last_name', $parent_invoice->get_last_name());
     ///$invoice->set( 'email', $parent_invoice->get_email() );
-    $invoice->set( 'phone', $parent_invoice->phone );
-    $invoice->set( 'address', $parent_invoice->address );
-    $invoice->set( 'city', $parent_invoice->city );
-    $invoice->set( 'country', $parent_invoice->country );
-    $invoice->set( 'state', $parent_invoice->state );
-    $invoice->set( 'zip', $parent_invoice->zip );
-    $invoice->set( 'company', $parent_invoice->company );
-    $invoice->set( 'vat_number', $parent_invoice->vat_number );
-    $invoice->set( 'vat_rate', $parent_invoice->vat_rate );
-    $invoice->set( 'adddress_confirmed', $parent_invoice->adddress_confirmed );
-
-    if ( empty( $args['gateway'] ) ) {
-        $invoice->set( 'gateway', $parent_invoice->get_gateway() );
+    $invoice->set('phone', $parent_invoice->phone);
+    $invoice->set('address', $parent_invoice->address);
+    $invoice->set('city', $parent_invoice->city);
+    $invoice->set('country', $parent_invoice->country);
+    $invoice->set('state', $parent_invoice->state);
+    $invoice->set('zip', $parent_invoice->zip);
+    $invoice->set('company', $parent_invoice->company);
+    $invoice->set('vat_number', $parent_invoice->vat_number);
+    $invoice->set('vat_rate', $parent_invoice->vat_rate);
+    $invoice->set('adddress_confirmed', $parent_invoice->adddress_confirmed);
+
+    if (empty($args['gateway'])) {
+        $invoice->set('gateway', $parent_invoice->get_gateway());
     } else {
-        $invoice->set( 'gateway', $args['gateway'] );
+        $invoice->set('gateway', $args['gateway']);
     }
     
     $recurring_details = $parent_invoice->get_recurring_details();
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
     // increase the earnings for each item in the subscription
     $items = $recurring_details['cart_details'];
     
-    if ( $items ) {        
+    if ($items) {        
         $add_items      = array();
         $cart_details   = array();
         
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
             $add_item             = array();
             $add_item['id']       = $item['id'];
             $add_item['quantity'] = $item['quantity'];
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
             break;
         }
         
-        $invoice->set( 'items', $add_items );
+        $invoice->set('items', $add_items);
         $invoice->cart_details = $cart_details;
     }
     
@@ -129,277 +129,277 @@  discard block
 block discarded – undo
     $tax                = $recurring_details['tax'];
     $discount           = $recurring_details['discount'];
     
-    if ( $discount > 0 ) {
-        $invoice->set( 'discount_code', $parent_invoice->discount_code );
+    if ($discount > 0) {
+        $invoice->set('discount_code', $parent_invoice->discount_code);
     }
     
-    $invoice->subtotal = wpinv_round_amount( $subtotal );
-    $invoice->tax      = wpinv_round_amount( $tax );
-    $invoice->discount = wpinv_round_amount( $discount );
-    $invoice->total    = wpinv_round_amount( $total );
+    $invoice->subtotal = wpinv_round_amount($subtotal);
+    $invoice->tax      = wpinv_round_amount($tax);
+    $invoice->discount = wpinv_round_amount($discount);
+    $invoice->total    = wpinv_round_amount($total);
     $invoice->save();
     
-    wpinv_update_payment_status( $invoice->ID, 'publish' );
+    wpinv_update_payment_status($invoice->ID, 'publish');
     sleep(1);
-    wpinv_update_payment_status( $invoice->ID, 'wpi-renewal' );
+    wpinv_update_payment_status($invoice->ID, 'wpi-renewal');
     
-    $invoice = wpinv_get_invoice( $invoice->ID );
+    $invoice = wpinv_get_invoice($invoice->ID);
     
-    $subscription_data                      = wpinv_payment_subscription_data( $parent_invoice );
+    $subscription_data                      = wpinv_payment_subscription_data($parent_invoice);
     $subscription_data['recurring_amount']  = $invoice->get_total();
-    $subscription_data['created']           = current_time( 'mysql', 0 );
-    $subscription_data['expiration']        = $invoice->get_new_expiration( $subscription_data['item_id'] );
+    $subscription_data['created']           = current_time('mysql', 0);
+    $subscription_data['expiration']        = $invoice->get_new_expiration($subscription_data['item_id']);
     
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $invoice->update_subscription( $subscription_data );
+    $invoice->update_subscription($subscription_data);
 
-    do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args );
-    do_action( 'wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args );
+    do_action('wpinv_recurring_add_subscription_payment', $invoice, $parent_invoice, $subscription_args);
+    do_action('wpinv_recurring_record_payment', $invoice->ID, $parent_invoice_id, $subscription_args);
 
     return $invoice;
 }
 
-function wpinv_payment_exists( $txn_id = '' ) {
+function wpinv_payment_exists($txn_id = '') {
     global $wpdb;
 
-    if ( empty( $txn_id ) ) {
+    if (empty($txn_id)) {
         return false;
     }
 
-    $txn_id = esc_sql( $txn_id );
+    $txn_id = esc_sql($txn_id);
 
-    $invoice = $wpdb->get_var( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1" );
+    $invoice = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_transaction_id' AND meta_value = '{$txn_id}' LIMIT 1");
 
-    if ( $invoice != null ) {
+    if ($invoice != null) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_subscription_data( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_subscription_data($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }    
 
     return $invoice->get_subscription_data();
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_get_pretty_subscription_period( $period ) {
+function wpinv_get_pretty_subscription_period($period) {
     $frequency = '';
     //Format period details
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $frequency = __( 'Daily', 'invoicing' );
+            $frequency = __('Daily', 'invoicing');
             break;
         case 'W' :
         case 'week' :
-            $frequency = __( 'Weekly', 'invoicing' );
+            $frequency = __('Weekly', 'invoicing');
             break;
         case 'M' :
         case 'month' :
-            $frequency = __( 'Monthly', 'invoicing' );
+            $frequency = __('Monthly', 'invoicing');
             break;
         case 'Y' :
         case 'year' :
-            $frequency = __( 'Yearly', 'invoicing' );
+            $frequency = __('Yearly', 'invoicing');
             break;
         default :
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period', $frequency, $period );
+            $frequency = apply_filters('wpinv_pretty_subscription_period', $frequency, $period);
             break;
     }
 
     return $frequency;
 }
 
-function wpinv_get_pretty_subscription_period_name( $period ) {
+function wpinv_get_pretty_subscription_period_name($period) {
     $frequency = '';
     //Format period details
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $frequency = __( 'Day', 'invoicing' );
+            $frequency = __('Day', 'invoicing');
             break;
         case 'W' :
         case 'week' :
-            $frequency = __( 'Week', 'invoicing' );
+            $frequency = __('Week', 'invoicing');
             break;
         case 'M' :
         case 'month' :
-            $frequency = __( 'Month', 'invoicing' );
+            $frequency = __('Month', 'invoicing');
             break;
         case 'Y' :
         case 'year' :
-            $frequency = __( 'Year', 'invoicing' );
+            $frequency = __('Year', 'invoicing');
             break;
         default :
-            $frequency = apply_filters( 'wpinv_pretty_subscription_period_name', $frequency, $period );
+            $frequency = apply_filters('wpinv_pretty_subscription_period_name', $frequency, $period);
             break;
     }
 
     return $frequency;
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
     $interval   = (int)$interval > 0 ? (int)$interval : 1;
     $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int)$bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
     
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -407,45 +407,45 @@  discard block
 block discarded – undo
             $trial_interval = 0;
         }
         
-        $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() );
+        $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());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( wpinv_format_amount( $initial_total ), $currency );
-    $recurring_amount   = wpinv_price( wpinv_format_amount( $recurring_total ), $currency );
+    $initial_amount     = wpinv_price(wpinv_format_amount($initial_total), $currency);
+    $recurring_amount   = wpinv_price(wpinv_format_amount($recurring_total), $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
-function wpinv_recurring_send_payment_failed( $invoice ) {
-    if ( !empty( $invoice->ID ) ) {
-        wpinv_failed_invoice_notification( $invoice->ID );
+function wpinv_recurring_send_payment_failed($invoice) {
+    if (!empty($invoice->ID)) {
+        wpinv_failed_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1 );
\ No newline at end of file
+add_action('wpinv_recurring_payment_failed', 'wpinv_recurring_send_payment_failed', 10, 1);
\ No newline at end of file

Please login to merge, or discard this patch.

includes/class-wpinv-api.php 2 patches

Doc Comments +8 added lines patch added patch discarded remove patch

@@ -47,6 +47,9 @@  discard block
 block discarded – undo
         }
     }
     
+    /**
+     * @param integer $code
+     */
     public function send_status( $code ) {
         status_header( $code );
     }
@@ -195,6 +198,11 @@  discard block
 block discarded – undo
 class WPInv_API_Exception extends Exception {
     protected $error_code;
 
+    /**
+     * @param string $error_code
+     * @param string $error_message
+     * @param integer $http_status_code
+     */
     public function __construct( $error_code, $error_message, $http_status_code ) {
         $this->error_code = $error_code;
         parent::__construct( $error_message, $http_status_code );

Please login to merge, or discard this patch.

Spacing +67 added lines, -67 removed lines patch added patch discarded remove patch

@@ -7,51 +7,51 @@  discard block
 block discarded – undo
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_API {
     protected $post_type = 'wpi_invoice';
     
-    public function __construct( $params = array() ) {
+    public function __construct($params = array()) {
     }
-    public function insert_invoice( $data ) {
+    public function insert_invoice($data) {
         global $wpdb;
         //wpinv_transaction_query( 'start' );
 
         try {
-            if ( empty( $data['invoice'] ) ) {
-                throw new WPInv_API_Exception( 'wpinv_api_missing_invoice_data', sprintf( __( 'No %1$s data specified to create %1$s', 'invoicing' ), 'invoice' ), 400 );
+            if (empty($data['invoice'])) {
+                throw new WPInv_API_Exception('wpinv_api_missing_invoice_data', sprintf(__('No %1$s data specified to create %1$s', 'invoicing'), 'invoice'), 400);
             }
 
-            $data = apply_filters( 'wpinv_api_create_invoice_data', $data['invoice'], $this );
+            $data = apply_filters('wpinv_api_create_invoice_data', $data['invoice'], $this);
 
-            $invoice = wpinv_insert_invoice( $data, true );
-            if ( empty( $invoice->ID ) || is_wp_error( $invoice ) ) {
-                throw new WPInv_API_Exception( 'wpinv_api_cannot_create_invoice', sprintf( __( 'Cannot create invoice: %s', 'invoicing' ), implode( ', ', $invoice->get_error_messages() ) ), 400 );
+            $invoice = wpinv_insert_invoice($data, true);
+            if (empty($invoice->ID) || is_wp_error($invoice)) {
+                throw new WPInv_API_Exception('wpinv_api_cannot_create_invoice', sprintf(__('Cannot create invoice: %s', 'invoicing'), implode(', ', $invoice->get_error_messages())), 400);
             }
 
             // HTTP 201 Created
-            $this->send_status( 201 );
+            $this->send_status(201);
 
-            do_action( 'wpinv_api_create_invoice', $invoice->ID, $data, $this );
+            do_action('wpinv_api_create_invoice', $invoice->ID, $data, $this);
 
             //wpinv_transaction_query( 'commit' );
 
-            return wpinv_get_invoice( $invoice->ID );
-        } catch ( WPInv_API_Exception $e ) {
+            return wpinv_get_invoice($invoice->ID);
+        } catch (WPInv_API_Exception $e) {
             //wpinv_transaction_query( 'rollback' );
 
-            return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+            return new WP_Error($e->getErrorCode(), $e->getMessage(), array('status' => $e->getCode()));
         }
     }
     
-    public function send_status( $code ) {
-        status_header( $code );
+    public function send_status($code) {
+        status_header($code);
     }
     
-    protected function set_billing_details( $invoice, $data ) {
+    protected function set_billing_details($invoice, $data) {
         $address_fields = array(
             'user_id',
             'first_name',
@@ -70,66 +70,66 @@  discard block
 block discarded – undo
         $billing_details = array();
         $user_id = $invoice->get_user_id();
         
-        foreach ( $address_fields as $field ) {
-            if ( isset( $data['billing_details'][ $field ] ) ) {
-                $value = sanitize_text_field( $data['billing_details'][ $field ] );
+        foreach ($address_fields as $field) {
+            if (isset($data['billing_details'][$field])) {
+                $value = sanitize_text_field($data['billing_details'][$field]);
                 
-                if ( $field == 'country' && empty( $value ) ) {
-                    if ( !empty( $invoice->country ) ) {
+                if ($field == 'country' && empty($value)) {
+                    if (!empty($invoice->country)) {
                         $value = $invoice->country;
                     } else {
-                        $value = wpinv_default_billing_country( '', $user_id );
+                        $value = wpinv_default_billing_country('', $user_id);
                     }
                 }
                 
-                if ( $field == 'state' && empty( $value ) ) {
-                    if ( !empty( $invoice->state ) ) {
+                if ($field == 'state' && empty($value)) {
+                    if (!empty($invoice->state)) {
                         $value = $invoice->state;
                     } else {
                         $value = wpinv_get_default_state();
                     }
                 }
                 
-                $invoice->set( $field, $value );
+                $invoice->set($field, $value);
                 
-                update_post_meta( $invoice->ID, '_wpinv_' . $field, $value );
+                update_post_meta($invoice->ID, '_wpinv_' . $field, $value);
             }
         }
         
         return $invoice;
     }
     
-    protected function set_discount( $invoice, $data ) {
-        if ( isset( $data['discount'] ) ) {
-            $invoice->set( 'discount', wpinv_round_amount( $data['discount'] ) );
+    protected function set_discount($invoice, $data) {
+        if (isset($data['discount'])) {
+            $invoice->set('discount', wpinv_round_amount($data['discount']));
             
-            update_post_meta( $invoice->ID, '_wpinv_discount', wpinv_round_amount( $data['discount'] ) );
+            update_post_meta($invoice->ID, '_wpinv_discount', wpinv_round_amount($data['discount']));
             
-            if ( isset( $data['discount_code'] ) ) {
-                $invoice->set( 'discount_code', $data['discount_code'] );
+            if (isset($data['discount_code'])) {
+                $invoice->set('discount_code', $data['discount_code']);
                 
-                update_post_meta( $invoice->ID, '_wpinv_discount_code', $data['discount_code'] );
+                update_post_meta($invoice->ID, '_wpinv_discount_code', $data['discount_code']);
             }
         }
         
         return $invoice;
     }
     
-    protected function set_items( $invoice, $data ) {
-        if ( !empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    protected function set_items($invoice, $data) {
+        if (!empty($data['items']) && is_array($data['items'])) {
             $items_array = array();
            
-            if ( !empty( $invoice->country ) ) {
+            if (!empty($invoice->country)) {
                 $country = $invoice->country;
-            } else if ( !empty( $data['billing_details']['country'] ) ) {
+            } else if (!empty($data['billing_details']['country'])) {
                 $country = $data['billing_details']['country'];
             } else {
-                $country = wpinv_default_billing_country( '', $invoice->get_user_id() );
+                $country = wpinv_default_billing_country('', $invoice->get_user_id());
             }
             
-            if ( !empty( $invoice->state ) ) {
+            if (!empty($invoice->state)) {
                 $state = $invoice->state;
-            } else if ( !empty( $data['billing_details']['state'] ) ) {
+            } else if (!empty($data['billing_details']['state'])) {
                 $state = $data['billing_details']['state'];
             } else {
                 $state = wpinv_get_default_state();
@@ -138,54 +138,54 @@  discard block
 block discarded – undo
             $_POST['country']   = $country;
             $_POST['state']     = $state;
             
-            $rate = wpinv_get_tax_rate( $country, $state, 'global' );
+            $rate = wpinv_get_tax_rate($country, $state, 'global');
             
             $total_tax = 0;
-            foreach ( $data['items'] as $item ) {
-                $id                 = isset( $item['id'] ) ? sanitize_text_field( $item['id'] ) : '';
-                $title              = isset( $item['title'] ) ? sanitize_text_field( $item['title'] ) : '';
-                $desc               = isset( $item['description'] ) ? sanitize_text_field( $item['description'] ) : '';
-                $amount             = isset( $item['amount'] ) ? wpinv_round_amount( $item['amount'] ) : 0;
+            foreach ($data['items'] as $item) {
+                $id                 = isset($item['id']) ? sanitize_text_field($item['id']) : '';
+                $title              = isset($item['title']) ? sanitize_text_field($item['title']) : '';
+                $desc               = isset($item['description']) ? sanitize_text_field($item['description']) : '';
+                $amount             = isset($item['amount']) ? wpinv_round_amount($item['amount']) : 0;
                 
-                if ( !empty( $item['vat_rates_class'] ) ) {
+                if (!empty($item['vat_rates_class'])) {
                     $vat_rates_class = $item['vat_rates_class'];
                 } else {
                     $vat_rates_class = '_standard';
                 }
-                $vat_rate = wpinv_get_tax_rate( $country, $state, $id );
+                $vat_rate = wpinv_get_tax_rate($country, $state, $id);
                 
-                $tax = $amount > 0 ? ( $amount * 0.01 * (float)$vat_rate ) : 0;
+                $tax = $amount > 0 ? ($amount * 0.01 * (float)$vat_rate) : 0;
                 $total_tax += $tax;
                 
                 $items_array[] = array(
                     'id'                => $id,
-                    'title'             => esc_html( $title ),
-                    'description'       => esc_html( $desc ),
-                    'amount'            => $amount > 0 ? wpinv_round_amount( $amount ) : 0,
-                    'subtotal'          => $amount > 0 ? wpinv_round_amount( $amount ) : 0,
+                    'title'             => esc_html($title),
+                    'description'       => esc_html($desc),
+                    'amount'            => $amount > 0 ? wpinv_round_amount($amount) : 0,
+                    'subtotal'          => $amount > 0 ? wpinv_round_amount($amount) : 0,
                     'vat_rates_class'   => $vat_rates_class,
                     'vat_rate'          => $vat_rate,
-                    'tax'               => $tax > 0 ? wpinv_round_amount( $tax ) : 0,
+                    'tax'               => $tax > 0 ? wpinv_round_amount($tax) : 0,
                 );
             }
 
-            update_post_meta( $invoice->ID, '_wpinv_tax', wpinv_round_amount( $total_tax ) );
-            $invoice->set( 'tax', wpinv_round_amount( $total_tax ) );
+            update_post_meta($invoice->ID, '_wpinv_tax', wpinv_round_amount($total_tax));
+            $invoice->set('tax', wpinv_round_amount($total_tax));
             
-            $items_array = apply_filters( 'wpinv_save_invoice_items', $items_array, $data['items'], $invoice );
+            $items_array = apply_filters('wpinv_save_invoice_items', $items_array, $data['items'], $invoice);
             
-            $invoice->set( 'items', $items_array );
-            update_post_meta( $invoice->ID, '_wpinv_items', $items_array );
+            $invoice->set('items', $items_array);
+            update_post_meta($invoice->ID, '_wpinv_items', $items_array);
         }
         
         return $invoice;
     }
     
-    protected function set_invoice_meta( $invoice_id, $invoice_meta ) {
-        foreach ( $invoice_meta as $meta_key => $meta_value ) {
+    protected function set_invoice_meta($invoice_id, $invoice_meta) {
+        foreach ($invoice_meta as $meta_key => $meta_value) {
 
-            if ( is_string( $meta_key) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
-                update_post_meta( $invoice_id, $meta_key, $meta_value );
+            if (is_string($meta_key) && !is_protected_meta($meta_key) && is_scalar($meta_value)) {
+                update_post_meta($invoice_id, $meta_key, $meta_value);
             }
         }
     }
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
 class WPInv_API_Exception extends Exception {
     protected $error_code;
 
-    public function __construct( $error_code, $error_message, $http_status_code ) {
+    public function __construct($error_code, $error_message, $http_status_code) {
         $this->error_code = $error_code;
-        parent::__construct( $error_message, $http_status_code );
+        parent::__construct($error_message, $http_status_code);
     }
 
     public function getErrorCode() {

Please login to merge, or discard this patch.

includes/admin/wpinv-upgrade-functions.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -11,37 +11,37 @@
 block discarded – undo
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
     
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
     
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
     
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
     
     // Invoices status
-    $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' )" );
+    $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' )");
     
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
     
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

includes/admin/meta-boxes/class-mb-invoice-address.php 1 patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -1,34 +1,34 @@  discard block
 block discarded – undo
 <?php
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Meta_Box_Billing_Details {
-    public static function output( $post ) {
+    public static function output($post) {
         global $user_ID;
-        $post_id    = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice    = new WPInv_Invoice( $post_id );
+        $post_id    = !empty($post->ID) ? $post->ID : 0;
+        $invoice    = new WPInv_Invoice($post_id);
 ?>
 <div class="gdmbx2-wrap form-table">
     <div id="gdmbx2-metabox-wpinv_address" class="gdmbx2-metabox gdmbx-field-list wpinv-address gdmbx-row">
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-user-id table-layout">
             <div class="gdmbx-th">
-                <label for="post_author_override"><?php _e( 'Customer', 'invoicing' );?></label>
+                <label for="post_author_override"><?php _e('Customer', 'invoicing'); ?></label>
             </div>
             <div class="gdmbx-td gdmbx-customer-div">
-            <?php wpinv_dropdown_users( array(
+            <?php wpinv_dropdown_users(array(
                             'name' => 'post_author_override',
                             'selected' => empty($post->ID) ? $user_ID : $post->post_author,
                             'include_selected' => true,
                             'show' => 'user_email',
                             'orderby' => 'user_email',
                             'class' => 'gdmbx2-text-large'
-                        ) ); ?>
+                        )); ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-email table-layout" style="display:none">
-            <div class="gdmbx-th"><label for="wpinv_email"><?php _e( 'Email', 'invoicing' );?> <span class="required">*</span></label>
+            <div class="gdmbx-th"><label for="wpinv_email"><?php _e('Email', 'invoicing'); ?> <span class="required">*</span></label>
             </div>
             <div class="gdmbx-td">
                 <input type="hidden" id="wpinv_new_user" name="wpinv_new_user" value="" />
@@ -36,56 +36,56 @@  discard block
 block discarded – undo
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-btns table-layout">
-            <div class="gdmbx-th"><label><?php _e( 'Actions', 'invoicing' );?></label>
+            <div class="gdmbx-th"><label><?php _e('Actions', 'invoicing'); ?></label>
             </div>
             <div class="gdmbx-td">
-                <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e( 'Fill User Details', 'invoicing' );?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e( 'Fill User Details', 'invoicing' );?></a>
-                <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e( 'Add New User', 'invoicing' );?></a>
-                <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e( 'Cancel', 'invoicing' );?> </a>
+                <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e('Fill User Details', 'invoicing'); ?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e('Fill User Details', 'invoicing'); ?></a>
+                <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e('Add New User', 'invoicing'); ?></a>
+                <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e('Cancel', 'invoicing'); ?> </a>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-first-name table-layout">
-            <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e( 'First Name', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e('First Name', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr( $invoice->first_name );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr($invoice->first_name); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-last-name table-layout">
-            <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e( 'Last Name', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e('Last Name', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr( $invoice->last_name );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr($invoice->last_name); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-company table-layout">
-            <div class="gdmbx-th"><label for="wpinv_company"><?php _e( 'Company', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_company"><?php _e('Company', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr( $invoice->company );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr($invoice->company); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-vat-number table-layout">
-            <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e( 'Vat Number', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e('Vat Number', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr( $invoice->vat_number );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr($invoice->vat_number); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-address table-layout">
-            <div class="gdmbx-th"><label for="wpinv_address"><?php _e( 'Address', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_address"><?php _e('Address', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr( $invoice->address );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr($invoice->address); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-city table-layout">
-            <div class="gdmbx-th"><label for="wpinv_city"><?php _e( 'City', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_city"><?php _e('City', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr( $invoice->city );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr($invoice->city); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-select gdmbx-wpinv-country table-layout">
-            <div class="gdmbx-th"><label for="wpinv_country"><?php _e( 'Country', 'invoicing' );?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
+            <div class="gdmbx-th"><label for="wpinv_country"><?php _e('Country', 'invoicing'); ?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
             <div class="gdmbx-td">
                 <?php
-                echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'Choose a country', 'invoicing' ) ), wpinv_get_country_list() ),
+                echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('Choose a country', 'invoicing')), wpinv_get_country_list()),
                     'name'             => 'wpinv_country',
                     'id'               => 'wpinv_country',
                     'selected'         => $invoice->country,
@@ -93,20 +93,20 @@  discard block
 block discarded – undo
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-large',
                     'chosen'           => false,
-                    'placeholder'      => __( 'Choose a country', 'invoicing' ),
+                    'placeholder'      => __('Choose a country', 'invoicing'),
                     'required'         => false,
-                ) );
+                ));
                 ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-state table-layout">
-            <div class="gdmbx-th"><label for="wpinv_state"><?php _e( 'State', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_state"><?php _e('State', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
                 <?php
-                $states = wpinv_get_country_states( $invoice->country );
-                if( !empty( $states ) ) {
-                    echo wpinv_html_select( array(
-                        'options'          => array_merge( array( '' => __( 'Choose a state', 'invoicing' ) ), $states ),
+                $states = wpinv_get_country_states($invoice->country);
+                if (!empty($states)) {
+                    echo wpinv_html_select(array(
+                        'options'          => array_merge(array('' => __('Choose a state', 'invoicing')), $states),
                         'name'             => 'wpinv_state',
                         'id'               => 'wpinv_state',
                         'selected'         => $invoice->state,
@@ -114,44 +114,44 @@  discard block
 block discarded – undo
                         'show_option_none' => false,
                         'class'            => 'gdmbx2-text-large',
                         'chosen'           => false,
-                        'placeholder'      => __( 'Choose a state', 'invoicing' ),
+                        'placeholder'      => __('Choose a state', 'invoicing'),
                         'required'         => false,
-                    ) );
+                    ));
                 } else {
-                    echo wpinv_html_text( array(
+                    echo wpinv_html_text(array(
                         'name'  => 'wpinv_state',
-                        'value' => ! empty( $invoice->state ) ? $invoice->state : '',
+                        'value' => !empty($invoice->state) ? $invoice->state : '',
                         'id'    => 'wpinv_state',
                         'class' => 'gdmbx2-text-large',
                         'required' => false,
-                    ) );
+                    ));
                 }
                 ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-zip table-layout">
-            <div class="gdmbx-th"><label for="wpinv_zip"><?php _e( 'Zipcode', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_zip"><?php _e('Zipcode', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr( $invoice->zip );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr($invoice->zip); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-phone table-layout">
-            <div class="gdmbx-th"><label for="wpinv_phone"><?php _e( 'Phone', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_phone"><?php _e('Phone', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr( $invoice->phone );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr($invoice->phone); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-ip table-layout">
-            <div class="gdmbx-th"><label for="wpinv_ip"><?php _e( 'IP Address', 'invoicing' );?><?php if ($invoice->ip) { ?>
-                &nbsp;&nbsp;<a href="<?php echo admin_url( 'admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip ); ?>" title="<?php esc_attr_e( 'View IP information', 'invoicing' );?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+            <div class="gdmbx-th"><label for="wpinv_ip"><?php _e('IP Address', 'invoicing'); ?><?php if ($invoice->ip) { ?>
+                &nbsp;&nbsp;<a href="<?php echo admin_url('admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip); ?>" title="<?php esc_attr_e('View IP information', 'invoicing'); ?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
                 <?php } ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr( $invoice->ip );?>" readonly />
+                <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr($invoice->ip); ?>" readonly />
             </div>
         </div>
     </div>
 </div>
-<?php wp_nonce_field( 'wpinv_save_invoice', 'wpinv_save_invoice' ) ;?>
+<?php wp_nonce_field('wpinv_save_invoice', 'wpinv_save_invoice'); ?>
 <?php
     }
 }

Please login to merge, or discard this patch.

templates/wpinv-invoice-history.php 3 patches

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( !( $user_id = get_current_user_id() ) ) {
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 
 		<tbody>
 			<?php foreach ( $user_invoices->invoices as $invoice ) {
-				?>
+                ?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
 						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
@@ -53,31 +53,31 @@  discard block
 block discarded – undo
 
 							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
 								<?php
-									$actions = array(
-										'pay'    => array(
-											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+                                    $actions = array(
+                                        'pay'    => array(
+                                            'url'  => $invoice->get_checkout_payment_url(),
+                                            'name' => __( 'Pay Now', 'invoicing' ),
                                             'class' => 'btn-success'
-										),
+                                        ),
                                         'print'   => array(
-											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+                                            'url'  => $invoice->get_view_url(),
+                                            'name' => __( 'Print', 'invoicing' ),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
-										)
-									);
+                                        )
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                    }
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
-											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+                                    if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
+                                        foreach ( $actions as $key => $action ) {
+                                            $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
                                             echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
-										}
-									}
-								?>
+                                        }
+                                    }
+                                ?>
 							<?php endif; ?>
 						</td>
 					<?php endforeach; ?>
@@ -91,26 +91,26 @@  discard block
 block discarded – undo
 	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-			$wpinv_cpt = isset($_REQUEST['wpinv-cpt']) ? $_REQUEST['wpinv-cpt'] : '';
-
-			if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt)
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt)
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
-
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
-				'total'   => $user_invoices->max_num_pages,
-				'add_args' => array(
-					'wpinv-cpt' => 'wpi_invoice',
-				)
-			) );
-			?>
+            $big = 999999;
+            $wpinv_cpt = isset($_REQUEST['wpinv-cpt']) ? $_REQUEST['wpinv-cpt'] : '';
+
+            if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt)
+                $current_page = get_query_var('paged');
+            elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt)
+                $current_page = get_query_var('page');
+            else
+                $current_page = 1;
+
+            echo paginate_links( array(
+                'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                'format'  => '?paged=%#%',
+                'current' => max( 1, $current_page ),
+                'total'   => $user_invoices->max_num_pages,
+                'add_args' => array(
+                    'wpinv-cpt' => 'wpi_invoice',
+                )
+            ) );
+            ?>
 		</div>
 	<?php endif; ?>
 

Please login to merge, or discard this patch.

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -1,80 +1,80 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( !( $user_id = get_current_user_id() ) ) {
+if (!($user_id = get_current_user_id())) {
     ?>
-    <div class="wpinv-empty alert alert-error"><?php _e( 'You are not allowed to access this section', 'invoicing' ) ;?></div>
+    <div class="wpinv-empty alert alert-error"><?php _e('You are not allowed to access this section', 'invoicing'); ?></div>
     <?php
     return;
 }
 
 global $current_page;
-$current_page   = empty( $current_page ) ? 1 : absint( $current_page );
-$query          = apply_filters( 'wpinv_user_invoices_query', array( 'user' => $user_id, 'page' => $current_page, 'paginate' => true ) );
-$user_invoices  = wpinv_get_invoices( $query );
+$current_page   = empty($current_page) ? 1 : absint($current_page);
+$query          = apply_filters('wpinv_user_invoices_query', array('user' => $user_id, 'page' => $current_page, 'paginate' => true));
+$user_invoices  = wpinv_get_invoices($query);
 $has_invoices   = 0 < $user_invoices->total;
     
-do_action( 'wpinv_before_user_invoices', $has_invoices ); ?>
+do_action('wpinv_before_user_invoices', $has_invoices); ?>
 
-<?php if ( $has_invoices ) { ?>
+<?php if ($has_invoices) { ?>
 	<table class="table table-bordered table-hover wpi-user-invoices">
 		<thead>
 			<tr>
-				<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-					<th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+				<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+					<th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
 				<?php endforeach; ?>
 			</tr>
 		</thead>
 
 		<tbody>
-			<?php foreach ( $user_invoices->invoices as $invoice ) {
+			<?php foreach ($user_invoices->invoices as $invoice) {
 				?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-							<?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-								<?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-							<?php elseif ( 'invoice-number' === $column_id ) : ?>
-								<a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-									<?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+					<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+						<td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+							<?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+								<?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+							<?php elseif ('invoice-number' === $column_id) : ?>
+								<a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+									<?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
 								</a>
 
-							<?php elseif ( 'invoice-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('invoice-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s'); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'invoice-status' === $column_id ) : ?>
-								<?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+							<?php elseif ('invoice-status' === $column_id) : ?>
+								<?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-							<?php elseif ( 'invoice-total' === $column_id ) : ?>
-								<?php echo $invoice->get_total( true ); ?>
+							<?php elseif ('invoice-total' === $column_id) : ?>
+								<?php echo $invoice->get_total(true); ?>
 
-							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
+							<?php elseif ('invoice-actions' === $column_id) : ?>
 								<?php
 									$actions = array(
 										'pay'    => array(
 											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+											'name' => __('Pay Now', 'invoicing'),
                                             'class' => 'btn-success'
 										),
                                         'print'   => array(
 											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+											'name' => __('Print', 'invoicing'),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
 										)
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 									}
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
+									if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+										foreach ($actions as $key => $action) {
 											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                            echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                            echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
 										}
 									}
 								?>
@@ -86,9 +86,9 @@  discard block
 block discarded – undo
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
+	<?php if (1 < $user_invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
@@ -101,23 +101,23 @@  discard block
 block discarded – undo
 			else
 				$current_page = 1;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
+				'current' => max(1, $current_page),
 				'total'   => $user_invoices->max_num_pages,
 				'add_args' => array(
 					'wpinv-cpt' => 'wpi_invoice',
 				)
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
 <?php } else { ?>
 	<div class="wpinv-empty alert-info">
-		<?php _e( 'No invoice has been made yet.', 'invoicing' ); ?>
+		<?php _e('No invoice has been made yet.', 'invoicing'); ?>
 	</div>
 <?php } ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $has_invoices ); ?>
+<?php do_action('wpinv_after_user_invoices', $has_invoices); ?>

Please login to merge, or discard this patch.

Braces +7 added lines, -6 removed lines patch added patch discarded remove patch

@@ -94,12 +94,13 @@
 block discarded – undo
 			$big = 999999;
 			$wpinv_cpt = isset($_REQUEST['wpinv-cpt']) ? $_REQUEST['wpinv-cpt'] : '';
 
-			if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt)
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt)
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
+			if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt) {
+							$current_page = get_query_var('paged');
+			} elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt) {
+							$current_page = get_query_var('page');
+			} else {
+							$current_page = 1;
+			}
 
 			echo paginate_links( array(
 				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),

Please login to merge, or discard this patch.

includes/class-wpinv-notes.php 1 patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,73 +14,73 @@  discard block
 block discarded – undo
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
         
         // Count comments
-        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 11, 2 );
+        add_filter('wp_count_comments', array($this, 'wp_count_comments'), 11, 2);
         
         // Delete comments count cache whenever there is a new comment or a comment status changes
-        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+        add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+        add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && in_array(get_post_type( $post_ID ), array($this->invoice_post_type, 'wpi_quote' )) ) {
+        if ($post_ID && in_array(get_post_type($post_ID), array($this->invoice_post_type, 'wpi_quote'))) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
                     $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'orderby'   => 'comment_ID',
             'order'     => 'ASC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
     
     /**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
      * @return void
      */
     public function delete_comments_count_cache() {
-        delete_transient( 'wpinv_count_comments' );
+        delete_transient('wpinv_count_comments');
     }
     
     /**
@@ -102,16 +102,16 @@  discard block
 block discarded – undo
      * @param  int    $post_id Post ID.
      * @return object
      */
-    public function wp_count_comments( $stats, $post_id ) {
+    public function wp_count_comments($stats, $post_id) {
         global $wpdb;
 
-        if ( 0 === $post_id ) {
-            $stats = get_transient( 'wpinv_count_comments' );
+        if (0 === $post_id) {
+            $stats = get_transient('wpinv_count_comments');
 
-            if ( ! $stats ) {
+            if (!$stats) {
                 $stats = array();
 
-                $count = $wpdb->get_results( "SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A );
+                $count = $wpdb->get_results("SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A);
 
                 $total = 0;
                 $approved = array(
@@ -122,26 +122,26 @@  discard block
 block discarded – undo
                     'post-trashed' => 'post-trashed',
                 );
 
-                foreach ( (array) $count as $row ) {
+                foreach ((array)$count as $row) {
                     // Do not count post-trashed toward totals.
-                    if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
+                    if ('post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved']) {
                         $total += $row['num_comments'];
                     }
-                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    if (isset($approved[$row['comment_approved']])) {
+                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
                     }
                 }
 
                 $stats['total_comments'] = $total;
                 $stats['all'] = $total;
-                foreach ( $approved as $key ) {
-                    if ( empty( $stats[ $key ] ) ) {
-                        $stats[ $key ] = 0;
+                foreach ($approved as $key) {
+                    if (empty($stats[$key])) {
+                        $stats[$key] = 0;
                     }
                 }
 
-                $stats = (object) $stats;
-                set_transient( 'wpinv_count_comments', $stats );
+                $stats = (object)$stats;
+                set_transient('wpinv_count_comments', $stats);
             }
         }
 

Please login to merge, or discard this patch.

		@@ -976,67 +976,67 @@
		block discarded – undo
976	976	function wpinv_tool_merge_fix_taxes() {
977	977	global $wpdb;
978	978
979		- $sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
980		- $items = $wpdb->get_results( $sql );
	979	+ $sql = "SELECT DISTINCT p.ID FROM `" . $wpdb->posts . "` AS p LEFT JOIN " . $wpdb->postmeta . " AS pm ON pm.post_id = p.ID WHERE p.post_type = 'wpi_item' AND pm.meta_key = '_wpinv_type' AND pm.meta_value = 'package'";
	980	+ $items = $wpdb->get_results( $sql );
981	981
982		- if ( !empty( $items ) ) {
983		- foreach ( $items as $item ) {
984		- if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
985		- update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
986		- }
987		- }
988		- }
	982	+ if ( !empty( $items ) ) {
	983	+ foreach ( $items as $item ) {
	984	+ if ( get_post_meta( $item->ID, '_wpinv_vat_class', true ) == '_exempt' ) {
	985	+ update_post_meta( $item->ID, '_wpinv_vat_class', '_standard' );
	986	+ }
	987	+ }
	988	+ }
989	989
990	990	$sql = "SELECT `p`.`ID`, gdi.id AS gdp_id FROM `" . INVOICE_TABLE . "` AS gdi LEFT JOIN `" . $wpdb->posts . "` AS p ON `p`.`ID` = `gdi`.`invoice_id` AND `p`.`post_type` = 'wpi_invoice' WHERE `p`.`ID` IS NOT NULL AND p.post_status NOT IN( 'publish', 'wpi-processing', 'wpi-renewal' ) ORDER BY `gdi`.`id` ASC";
991	991	$items = $wpdb->get_results( $sql );
992	992
993		- if ( !empty( $items ) ) {
994		- $success = false;
	993	+ if ( !empty( $items ) ) {
	994	+ $success = false;
995	995	$message = __( 'Taxes fixed for non-paid merged GD invoices.', 'invoicing' );
996	996
997		- global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
	997	+ global $wpi_userID, $wpinv_ip_address_country, $wpi_tax_rates;
998	998
999		- foreach ( $items as $item ) {
1000		- $wpi_tax_rates = NULL;
1001		- $data = wpinv_get_invoice($item->ID);
	999	+ foreach ( $items as $item ) {
	1000	+ $wpi_tax_rates = NULL;
	1001	+ $data = wpinv_get_invoice($item->ID);
1002	1002
1003		- if ( empty( $data ) ) {
1004		- continue;
1005		- }
	1003	+ if ( empty( $data ) ) {
	1004	+ continue;
	1005	+ }
1006	1006
1007		- $checkout_session = wpinv_get_checkout_session();
	1007	+ $checkout_session = wpinv_get_checkout_session();
1008	1008
1009		- $data_session = array();
1010		- $data_session['invoice_id'] = $data->ID;
1011		- $data_session['cart_discounts'] = $data->get_discounts( true );
	1009	+ $data_session = array();
	1010	+ $data_session['invoice_id'] = $data->ID;
	1011	+ $data_session['cart_discounts'] = $data->get_discounts( true );
1012	1012
1013		- wpinv_set_checkout_session( $data_session );
	1013	+ wpinv_set_checkout_session( $data_session );
1014	1014
1015		- $wpi_userID = (int)$data->get_user_id();
1016		- $_POST['country'] = !empty($data->country) ? $data->country : wpinv_get_default_country();
	1015	+ $wpi_userID = (int)$data->get_user_id();
	1016	+ $_POST['country'] = !empty($data->country) ? $data->country : wpinv_get_default_country();
1017	1017
1018		- $data->country = sanitize_text_field( $_POST['country'] );
1019		- $data->set( 'country', sanitize_text_field( $_POST['country'] ) );
	1018	+ $data->country = sanitize_text_field( $_POST['country'] );
	1019	+ $data->set( 'country', sanitize_text_field( $_POST['country'] ) );
1020	1020
1021		- $wpinv_ip_address_country = $data->country;
	1021	+ $wpinv_ip_address_country = $data->country;
1022	1022
1023		- $data->recalculate_totals(true);
	1023	+ $data->recalculate_totals(true);
1024	1024
1025		- wpinv_set_checkout_session( $checkout_session );
	1025	+ wpinv_set_checkout_session( $checkout_session );
1026	1026
1027		- $update_data = array();
1028		- $update_data['tax_amount'] = $data->get_tax();
1029		- $update_data['paied_amount'] = $data->get_total();
1030		- $update_data['invoice_id'] = $data->ID;
	1027	+ $update_data = array();
	1028	+ $update_data['tax_amount'] = $data->get_tax();
	1029	+ $update_data['paied_amount'] = $data->get_total();
	1030	+ $update_data['invoice_id'] = $data->ID;
1031	1031
1032		- $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
1033		- }
1034		- } else {
	1032	+ $wpdb->update( INVOICE_TABLE, $update_data, array( 'id' => $item->gdp_id ) );
	1033	+ }
	1034	+ } else {
1035	1035	$success = false;
1036	1036	$message = __( 'No invoices found to fix taxes!', 'invoicing' );
1037	1037	}
1038	1038
1039		- $response = array();
	1039	+ $response = array();
1040	1040	$response['success'] = $success;
1041	1041	$response['data']['message'] = $message;
1042	1042	wp_send_json( $response );

		@@ -740,6 +740,9 @@
		block discarded – undo
740	740	add_action( 'geodir_dashboard_links', 'wpinv_gdp_dashboard_invoice_history_link' );
741	741	remove_action( 'geodir_dashboard_links', 'geodir_payment_invoices_list_page_link' );
742	742
	743	+/**
	744	+ * @param string $new_status
	745	+ */
743	746	function wpinv_wpi_to_gdp_update_status( $invoice_id, $new_status, $old_status ) {
744	747	if (!defined('GEODIRPAYMENT_VERSION')) {
745	748	return false;

		@@ -1,7 +1,8 @@
		block discarded – undo
1	1	<?php
2	2	// don't load directly
3		-if ( !defined('ABSPATH') )
	3	+if ( !defined('ABSPATH') ) {
4	4	die('-1');
	5	+}
5	6
6	7	do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
7	8	?>

		@@ -1,18 +1,18 @@
		block discarded – undo
1	1	<?php
2	2	// don't load directly
3		-if ( !defined('ABSPATH') )
	3	+if (!defined('ABSPATH'))
4	4	die('-1');
5	5
6		-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
	6	+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
7	7	?>
8	8
9		-<p><?php printf( __( 'You have received payment from %s. The invoice is as follows:', 'invoicing' ), $invoice->get_user_full_name() ); ?></p>
	9	+<p><?php printf(__('You have received payment from %s. The invoice is as follows:', 'invoicing'), $invoice->get_user_full_name()); ?></p>
10	10
11	11	<?php
12		-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
	12	+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
13	13
14		-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
	14	+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
15	15
16		-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
	16	+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
17	17
18		-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
19	18	\ No newline at end of file
	19	+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
20	20	\ No newline at end of file

		@@ -1,41 +1,41 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( !defined('ABSPATH') ) {
	2	+if (!defined('ABSPATH')) {
3	3	exit;
4	4	}
5	5	global $post;
6	6	$invoice_id = $post->ID;
7		-$invoice = wpinv_get_invoice( $invoice_id );
8		-if ( empty( $invoice ) ) {
	7	+$invoice = wpinv_get_invoice($invoice_id);
	8	+if (empty($invoice)) {
9	9	exit;
10	10	}
11		-$type = $post->post_type == 'wpi_invoice' ? __( 'Invoice', 'invoicing' ): __( 'Quotation', 'invoicing' );
12		-do_action( 'wpinv_invoice_print_before_display', $invoice ); ?><!DOCTYPE html>
	11	+$type = $post->post_type == 'wpi_invoice' ? __('Invoice', 'invoicing') : __('Quotation', 'invoicing');
	12	+do_action('wpinv_invoice_print_before_display', $invoice); ?><!DOCTYPE html>
13	13	<html <?php language_attributes(); ?>>
14	14	<head>
15	15	<meta charset="UTF-8">
16	16	<title><?php wp_title() ?></title>
17		- <meta charset="<?php bloginfo( 'charset' ); ?>" />
	17	+ <meta charset="<?php bloginfo('charset'); ?>" />
18	18	<meta name="viewport" content="width=device-width, initial-scale=1">
19	19	<meta name="robots" content="noindex,nofollow">
20	20
21		- <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
	21	+ <?php do_action('wpinv_invoice_print_head', $invoice); ?>
22	22	</head>
23	23	<body class="body wpinv wpinv-print">
24		- <?php do_action( 'wpinv_invoice_print_body_start', $invoice ); ?>
	24	+ <?php do_action('wpinv_invoice_print_body_start', $invoice); ?>
25	25	<div class="container wpinv-wrap">
26		- <?php if ( $watermark = wpinv_watermark( $invoice_id ) ) { ?>
27		- <div class="watermark no-print"><p><?php echo esc_html( $watermark ) ?></p></div>
	26	+ <?php if ($watermark = wpinv_watermark($invoice_id)) { ?>
	27	+ <div class="watermark no-print"><p><?php echo esc_html($watermark) ?></p></div>
28	28	<?php } ?>
29	29	<!-- ///// Start PDF header -->
30	30	<htmlpageheader name="wpinv-pdf-header">
31		- <?php do_action( 'wpinv_invoice_print_before_header', $invoice ); ?>
	31	+ <?php do_action('wpinv_invoice_print_before_header', $invoice); ?>
32	32	<div class="row wpinv-header">
33	33	<div class="col-xs-6 wpinv-business">
34		- <a target="_blank" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
35		- <?php if ( $logo = wpinv_get_business_logo() ) { ?>
36		- <img class="logo" src="<?php echo esc_url( $logo ); ?>">
	34	+ <a target="_blank" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
	35	+ <?php if ($logo = wpinv_get_business_logo()) { ?>
	36	+ <img class="logo" src="<?php echo esc_url($logo); ?>">
37	37	<?php } else { ?>
38		- <h1><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
	38	+ <h1><?php echo esc_html(wpinv_get_business_name()); ?></h1>
39	39	<?php } ?>
40	40	</a>
41	41	</div>
		@@ -44,56 +44,56 @@ discard block
		block discarded – undo
44	44	<h2><?php echo $type; ?></h2>
45	45	</div>
46	46	</div>
47		- <?php do_action( 'wpinv_invoice_print_after_header', $invoice ); ?>
	47	+ <?php do_action('wpinv_invoice_print_after_header', $invoice); ?>
48	48	</htmlpageheader>
49	49	<!-- End PDF header ///// -->
50	50
51		- <?php do_action( 'wpinv_invoice_print_before_top_content', $invoice ); ?>
	51	+ <?php do_action('wpinv_invoice_print_before_top_content', $invoice); ?>
52	52	<div class="row wpinv-top-content">
53	53	<div class="col-xs-12 col-sm-6 wpinv-addresses">
54	54	<div class="col-xs-12 wpinv-address wpinv-from-address">
55	55	<?php wpinv_display_from_address(); ?>
56	56	</div>
57	57	<div class="col-xs-12 wpinv-address wpinv-to-address">
58		- <?php wpinv_display_to_address( $invoice_id ); ?>
	58	+ <?php wpinv_display_to_address($invoice_id); ?>
59	59	</div>
60	60	</div>
61	61	<div class="col-xs-12 col-sm-6 wpinv-details">
62	62	<div class="col-xs-12 wpinv-line-details">
63		- <?php do_action( 'wpinv_invoice_print_before_details', $invoice ); ?>
64		- <?php wpinv_display_invoice_details( $invoice ); ?>
65		- <?php do_action( 'wpinv_invoice_print_after_details', $invoice ); ?>
	63	+ <?php do_action('wpinv_invoice_print_before_details', $invoice); ?>
	64	+ <?php wpinv_display_invoice_details($invoice); ?>
	65	+ <?php do_action('wpinv_invoice_print_after_details', $invoice); ?>
66	66	</div>
67	67	</div>
68	68	</div>
69		- <?php do_action( 'wpinv_invoice_print_after_top_content', $invoice ); ?>
	69	+ <?php do_action('wpinv_invoice_print_after_top_content', $invoice); ?>
70	70
71		- <?php do_action( 'wpinv_invoice_print_middle', $invoice ); ?>
	71	+ <?php do_action('wpinv_invoice_print_middle', $invoice); ?>
72	72
73		- <?php do_action( 'wpinv_invoice_print_before_line_items', $invoice ); ?>
	73	+ <?php do_action('wpinv_invoice_print_before_line_items', $invoice); ?>
74	74	<div class="row wpinv-items">
75	75	<div class="col-sm-12 wpinv-line-items">
76		- <?php wpinv_display_line_items( $invoice_id ); ?>
	76	+ <?php wpinv_display_line_items($invoice_id); ?>
77	77	</div>
78	78	</div>
79		- <?php do_action( 'wpinv_invoice_print_after_line_items', $invoice ); ?>
	79	+ <?php do_action('wpinv_invoice_print_after_line_items', $invoice); ?>
80	80
81	81	<!-- ///// Start PDF footer -->
82	82	<htmlpagefooter name="wpinv-pdf-footer">
83		- <?php do_action( 'wpinv_invoice_print_before_footer', $invoice ); ?>
	83	+ <?php do_action('wpinv_invoice_print_before_footer', $invoice); ?>
84	84	<div class="row wpinv-footer">
85	85	<div class="col-sm-12">
86		- <?php if ( $term_text = wpinv_get_terms_text() ) { ?>
87		- <div class="terms-text"><?php echo wpautop( $term_text ); ?></div>
	86	+ <?php if ($term_text = wpinv_get_terms_text()) { ?>
	87	+ <div class="terms-text"><?php echo wpautop($term_text); ?></div>
88	88	<?php } ?>
89	89	<div class="footer-text"><?php echo wpinv_get_business_footer(); ?></div>
90		- <div class="print-only"><?php _e( 'Page ', 'invoicing' ) ?> {PAGENO}/{nbpg}</div>
	90	+ <div class="print-only"><?php _e('Page ', 'invoicing') ?> {PAGENO}/{nbpg}</div>
91	91	</div>
92	92	</div>
93		- <?php do_action( 'wpinv_invoice_print_after_footer', $invoice ); ?>
	93	+ <?php do_action('wpinv_invoice_print_after_footer', $invoice); ?>
94	94	</htmlpagefooter>
95	95	<!-- End PDF footer ///// -->
96	96	</div><!-- END wpinv-wrap -->
97		- <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
	97	+ <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
98	98	</body>
99	99	</html>
100	100	\ No newline at end of file

		@@ -47,6 +47,9 @@ discard block
		block discarded – undo
47	47	}
48	48	}
49	49
	50	+ /**
	51	+ * @param integer $code
	52	+ */
50	53	public function send_status( $code ) {
51	54	status_header( $code );
52	55	}
		@@ -195,6 +198,11 @@ discard block
		block discarded – undo
195	198	class WPInv_API_Exception extends Exception {
196	199	protected $error_code;
197	200
	201	+ /**
	202	+ * @param string $error_code
	203	+ * @param string $error_message
	204	+ * @param integer $http_status_code
	205	+ */
198	206	public function __construct( $error_code, $error_message, $http_status_code ) {
199	207	$this->error_code = $error_code;
200	208	parent::__construct( $error_message, $http_status_code );

		@@ -7,51 +7,51 @@ 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_API {
15	15	protected $post_type = 'wpi_invoice';
16	16
17		- public function __construct( $params = array() ) {
	17	+ public function __construct($params = array()) {
18	18	}
19		- public function insert_invoice( $data ) {
	19	+ public function insert_invoice($data) {
20	20	global $wpdb;
21	21	//wpinv_transaction_query( 'start' );
22	22
23	23	try {
24		- if ( empty( $data['invoice'] ) ) {
25		- throw new WPInv_API_Exception( 'wpinv_api_missing_invoice_data', sprintf( __( 'No %1$s data specified to create %1$s', 'invoicing' ), 'invoice' ), 400 );
	24	+ if (empty($data['invoice'])) {
	25	+ throw new WPInv_API_Exception('wpinv_api_missing_invoice_data', sprintf(__('No %1$s data specified to create %1$s', 'invoicing'), 'invoice'), 400);
26	26	}
27	27
28		- $data = apply_filters( 'wpinv_api_create_invoice_data', $data['invoice'], $this );
	28	+ $data = apply_filters('wpinv_api_create_invoice_data', $data['invoice'], $this);
29	29
30		- $invoice = wpinv_insert_invoice( $data, true );
31		- if ( empty( $invoice->ID ) \|\| is_wp_error( $invoice ) ) {
32		- throw new WPInv_API_Exception( 'wpinv_api_cannot_create_invoice', sprintf( __( 'Cannot create invoice: %s', 'invoicing' ), implode( ', ', $invoice->get_error_messages() ) ), 400 );
	30	+ $invoice = wpinv_insert_invoice($data, true);
	31	+ if (empty($invoice->ID) \|\| is_wp_error($invoice)) {
	32	+ throw new WPInv_API_Exception('wpinv_api_cannot_create_invoice', sprintf(__('Cannot create invoice: %s', 'invoicing'), implode(', ', $invoice->get_error_messages())), 400);
33	33	}
34	34
35	35	// HTTP 201 Created
36		- $this->send_status( 201 );
	36	+ $this->send_status(201);
37	37
38		- do_action( 'wpinv_api_create_invoice', $invoice->ID, $data, $this );
	38	+ do_action('wpinv_api_create_invoice', $invoice->ID, $data, $this);
39	39
40	40	//wpinv_transaction_query( 'commit' );
41	41
42		- return wpinv_get_invoice( $invoice->ID );
43		- } catch ( WPInv_API_Exception $e ) {
	42	+ return wpinv_get_invoice($invoice->ID);
	43	+ } catch (WPInv_API_Exception $e) {
44	44	//wpinv_transaction_query( 'rollback' );
45	45
46		- return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
	46	+ return new WP_Error($e->getErrorCode(), $e->getMessage(), array('status' => $e->getCode()));
47	47	}
48	48	}
49	49
50		- public function send_status( $code ) {
51		- status_header( $code );
	50	+ public function send_status($code) {
	51	+ status_header($code);
52	52	}
53	53
54		- protected function set_billing_details( $invoice, $data ) {
	54	+ protected function set_billing_details($invoice, $data) {
55	55	$address_fields = array(
56	56	'user_id',
57	57	'first_name',
		@@ -70,66 +70,66 @@ discard block
		block discarded – undo
70	70	$billing_details = array();
71	71	$user_id = $invoice->get_user_id();
72	72
73		- foreach ( $address_fields as $field ) {
74		- if ( isset( $data['billing_details'][ $field ] ) ) {
75		- $value = sanitize_text_field( $data['billing_details'][ $field ] );
	73	+ foreach ($address_fields as $field) {
	74	+ if (isset($data['billing_details'][$field])) {
	75	+ $value = sanitize_text_field($data['billing_details'][$field]);
76	76
77		- if ( $field == 'country' && empty( $value ) ) {
78		- if ( !empty( $invoice->country ) ) {
	77	+ if ($field == 'country' && empty($value)) {
	78	+ if (!empty($invoice->country)) {
79	79	$value = $invoice->country;
80	80	} else {
81		- $value = wpinv_default_billing_country( '', $user_id );
	81	+ $value = wpinv_default_billing_country('', $user_id);
82	82	}
83	83	}
84	84
85		- if ( $field == 'state' && empty( $value ) ) {
86		- if ( !empty( $invoice->state ) ) {
	85	+ if ($field == 'state' && empty($value)) {
	86	+ if (!empty($invoice->state)) {
87	87	$value = $invoice->state;
88	88	} else {
89	89	$value = wpinv_get_default_state();
90	90	}
91	91	}
92	92
93		- $invoice->set( $field, $value );
	93	+ $invoice->set($field, $value);
94	94
95		- update_post_meta( $invoice->ID, '_wpinv_' . $field, $value );
	95	+ update_post_meta($invoice->ID, '_wpinv_' . $field, $value);
96	96	}
97	97	}
98	98
99	99	return $invoice;
100	100	}
101	101
102		- protected function set_discount( $invoice, $data ) {
103		- if ( isset( $data['discount'] ) ) {
104		- $invoice->set( 'discount', wpinv_round_amount( $data['discount'] ) );
	102	+ protected function set_discount($invoice, $data) {
	103	+ if (isset($data['discount'])) {
	104	+ $invoice->set('discount', wpinv_round_amount($data['discount']));
105	105
106		- update_post_meta( $invoice->ID, '_wpinv_discount', wpinv_round_amount( $data['discount'] ) );
	106	+ update_post_meta($invoice->ID, '_wpinv_discount', wpinv_round_amount($data['discount']));
107	107
108		- if ( isset( $data['discount_code'] ) ) {
109		- $invoice->set( 'discount_code', $data['discount_code'] );
	108	+ if (isset($data['discount_code'])) {
	109	+ $invoice->set('discount_code', $data['discount_code']);
110	110
111		- update_post_meta( $invoice->ID, '_wpinv_discount_code', $data['discount_code'] );
	111	+ update_post_meta($invoice->ID, '_wpinv_discount_code', $data['discount_code']);
112	112	}
113	113	}
114	114
115	115	return $invoice;
116	116	}
117	117
118		- protected function set_items( $invoice, $data ) {
119		- if ( !empty( $data['items'] ) && is_array( $data['items'] ) ) {
	118	+ protected function set_items($invoice, $data) {
	119	+ if (!empty($data['items']) && is_array($data['items'])) {
120	120	$items_array = array();
121	121
122		- if ( !empty( $invoice->country ) ) {
	122	+ if (!empty($invoice->country)) {
123	123	$country = $invoice->country;
124		- } else if ( !empty( $data['billing_details']['country'] ) ) {
	124	+ } else if (!empty($data['billing_details']['country'])) {
125	125	$country = $data['billing_details']['country'];
126	126	} else {
127		- $country = wpinv_default_billing_country( '', $invoice->get_user_id() );
	127	+ $country = wpinv_default_billing_country('', $invoice->get_user_id());
128	128	}
129	129
130		- if ( !empty( $invoice->state ) ) {
	130	+ if (!empty($invoice->state)) {
131	131	$state = $invoice->state;
132		- } else if ( !empty( $data['billing_details']['state'] ) ) {
	132	+ } else if (!empty($data['billing_details']['state'])) {
133	133	$state = $data['billing_details']['state'];
134	134	} else {
135	135	$state = wpinv_get_default_state();
		@@ -138,54 +138,54 @@ discard block
		block discarded – undo
138	138	$_POST['country'] = $country;
139	139	$_POST['state'] = $state;
140	140
141		- $rate = wpinv_get_tax_rate( $country, $state, 'global' );
	141	+ $rate = wpinv_get_tax_rate($country, $state, 'global');
142	142
143	143	$total_tax = 0;
144		- foreach ( $data['items'] as $item ) {
145		- $id = isset( $item['id'] ) ? sanitize_text_field( $item['id'] ) : '';
146		- $title = isset( $item['title'] ) ? sanitize_text_field( $item['title'] ) : '';
147		- $desc = isset( $item['description'] ) ? sanitize_text_field( $item['description'] ) : '';
148		- $amount = isset( $item['amount'] ) ? wpinv_round_amount( $item['amount'] ) : 0;
	144	+ foreach ($data['items'] as $item) {
	145	+ $id = isset($item['id']) ? sanitize_text_field($item['id']) : '';
	146	+ $title = isset($item['title']) ? sanitize_text_field($item['title']) : '';
	147	+ $desc = isset($item['description']) ? sanitize_text_field($item['description']) : '';
	148	+ $amount = isset($item['amount']) ? wpinv_round_amount($item['amount']) : 0;
149	149
150		- if ( !empty( $item['vat_rates_class'] ) ) {
	150	+ if (!empty($item['vat_rates_class'])) {
151	151	$vat_rates_class = $item['vat_rates_class'];
152	152	} else {
153	153	$vat_rates_class = '_standard';
154	154	}
155		- $vat_rate = wpinv_get_tax_rate( $country, $state, $id );
	155	+ $vat_rate = wpinv_get_tax_rate($country, $state, $id);
156	156
157		- $tax = $amount > 0 ? ( $amount * 0.01 * (float)$vat_rate ) : 0;
	157	+ $tax = $amount > 0 ? ($amount * 0.01 * (float)$vat_rate) : 0;
158	158	$total_tax += $tax;
159	159
160	160	$items_array[] = array(
161	161	'id' => $id,
162		- 'title' => esc_html( $title ),
163		- 'description' => esc_html( $desc ),
164		- 'amount' => $amount > 0 ? wpinv_round_amount( $amount ) : 0,
165		- 'subtotal' => $amount > 0 ? wpinv_round_amount( $amount ) : 0,
	162	+ 'title' => esc_html($title),
	163	+ 'description' => esc_html($desc),
	164	+ 'amount' => $amount > 0 ? wpinv_round_amount($amount) : 0,
	165	+ 'subtotal' => $amount > 0 ? wpinv_round_amount($amount) : 0,
166	166	'vat_rates_class' => $vat_rates_class,
167	167	'vat_rate' => $vat_rate,
168		- 'tax' => $tax > 0 ? wpinv_round_amount( $tax ) : 0,
	168	+ 'tax' => $tax > 0 ? wpinv_round_amount($tax) : 0,
169	169	);
170	170	}
171	171
172		- update_post_meta( $invoice->ID, '_wpinv_tax', wpinv_round_amount( $total_tax ) );
173		- $invoice->set( 'tax', wpinv_round_amount( $total_tax ) );
	172	+ update_post_meta($invoice->ID, '_wpinv_tax', wpinv_round_amount($total_tax));
	173	+ $invoice->set('tax', wpinv_round_amount($total_tax));
174	174
175		- $items_array = apply_filters( 'wpinv_save_invoice_items', $items_array, $data['items'], $invoice );
	175	+ $items_array = apply_filters('wpinv_save_invoice_items', $items_array, $data['items'], $invoice);
176	176
177		- $invoice->set( 'items', $items_array );
178		- update_post_meta( $invoice->ID, '_wpinv_items', $items_array );
	177	+ $invoice->set('items', $items_array);
	178	+ update_post_meta($invoice->ID, '_wpinv_items', $items_array);
179	179	}
180	180
181	181	return $invoice;
182	182	}
183	183
184		- protected function set_invoice_meta( $invoice_id, $invoice_meta ) {
185		- foreach ( $invoice_meta as $meta_key => $meta_value ) {
	184	+ protected function set_invoice_meta($invoice_id, $invoice_meta) {
	185	+ foreach ($invoice_meta as $meta_key => $meta_value) {
186	186
187		- if ( is_string( $meta_key) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
188		- update_post_meta( $invoice_id, $meta_key, $meta_value );
	187	+ if (is_string($meta_key) && !is_protected_meta($meta_key) && is_scalar($meta_value)) {
	188	+ update_post_meta($invoice_id, $meta_key, $meta_value);
189	189	}
190	190	}
191	191	}
		@@ -195,9 +195,9 @@ discard block
		block discarded – undo
195	195	class WPInv_API_Exception extends Exception {
196	196	protected $error_code;
197	197
198		- public function __construct( $error_code, $error_message, $http_status_code ) {
	198	+ public function __construct($error_code, $error_message, $http_status_code) {
199	199	$this->error_code = $error_code;
200		- parent::__construct( $error_message, $http_status_code );
	200	+ parent::__construct($error_message, $http_status_code);
201	201	}
202	202
203	203	public function getErrorCode() {

		@@ -11,37 +11,37 @@
		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	31	// Invoices status
32		- $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	+ $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' )");
33	33
34	34	// Item meta key changes
35	35	$query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
36		- $results = $wpdb->get_results( $query );
	36	+ $results = $wpdb->get_results($query);
37	37
38		- if ( !empty( $results ) ) {
39		- $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
40		- $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
41		- $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
	38	+ if (!empty($results)) {
	39	+ $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
	40	+ $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
	41	+ $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
42	42
43		- foreach ( $results as $row ) {
44		- clean_post_cache( $row->post_id );
	43	+ foreach ($results as $row) {
	44	+ clean_post_cache($row->post_id);
45	45	}
46	46	}
47	47	}
48	48	\ No newline at end of file

		@@ -1,34 +1,34 @@ 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_Billing_Details {
8		- public static function output( $post ) {
	8	+ public static function output($post) {
9	9	global $user_ID;
10		- $post_id = !empty( $post->ID ) ? $post->ID : 0;
11		- $invoice = new WPInv_Invoice( $post_id );
	10	+ $post_id = !empty($post->ID) ? $post->ID : 0;
	11	+ $invoice = new WPInv_Invoice($post_id);
12	12	?>
13	13	<div class="gdmbx2-wrap form-table">
14	14	<div id="gdmbx2-metabox-wpinv_address" class="gdmbx2-metabox gdmbx-field-list wpinv-address gdmbx-row">
15	15	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-user-id table-layout">
16	16	<div class="gdmbx-th">
17		- <label for="post_author_override"><?php _e( 'Customer', 'invoicing' );?></label>
	17	+ <label for="post_author_override"><?php _e('Customer', 'invoicing'); ?></label>
18	18	</div>
19	19	<div class="gdmbx-td gdmbx-customer-div">
20		- <?php wpinv_dropdown_users( array(
	20	+ <?php wpinv_dropdown_users(array(
21	21	'name' => 'post_author_override',
22	22	'selected' => empty($post->ID) ? $user_ID : $post->post_author,
23	23	'include_selected' => true,
24	24	'show' => 'user_email',
25	25	'orderby' => 'user_email',
26	26	'class' => 'gdmbx2-text-large'
27		- ) ); ?>
	27	+ )); ?>
28	28	</div>
29	29	</div>
30	30	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-email table-layout" style="display:none">
31		- <div class="gdmbx-th"><label for="wpinv_email"><?php _e( 'Email', 'invoicing' );?> <span class="required">*</span></label>
	31	+ <div class="gdmbx-th"><label for="wpinv_email"><?php _e('Email', 'invoicing'); ?> <span class="required">*</span></label>
32	32	</div>
33	33	<div class="gdmbx-td">
34	34	<input type="hidden" id="wpinv_new_user" name="wpinv_new_user" value="" />
		@@ -36,56 +36,56 @@ discard block
		block discarded – undo
36	36	</div>
37	37	</div>
38	38	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-btns table-layout">
39		- <div class="gdmbx-th"><label><?php _e( 'Actions', 'invoicing' );?></label>
	39	+ <div class="gdmbx-th"><label><?php _e('Actions', 'invoicing'); ?></label>
40	40	</div>
41	41	<div class="gdmbx-td">
42		- <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e( 'Fill User Details', 'invoicing' );?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e( 'Fill User Details', 'invoicing' );?></a>
43		- <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e( 'Add New User', 'invoicing' );?></a>
44		- <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e( 'Cancel', 'invoicing' );?> </a>
	42	+ <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e('Fill User Details', 'invoicing'); ?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e('Fill User Details', 'invoicing'); ?></a>
	43	+ <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e('Add New User', 'invoicing'); ?></a>
	44	+ <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e('Cancel', 'invoicing'); ?> </a>
45	45	</div>
46	46	</div>
47	47	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-first-name table-layout">
48		- <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e( 'First Name', 'invoicing' );?></label></div>
	48	+ <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e('First Name', 'invoicing'); ?></label></div>
49	49	<div class="gdmbx-td">
50		- <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr( $invoice->first_name );?>" />
	50	+ <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr($invoice->first_name); ?>" />
51	51	</div>
52	52	</div>
53	53	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-last-name table-layout">
54		- <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e( 'Last Name', 'invoicing' );?></label></div>
	54	+ <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e('Last Name', 'invoicing'); ?></label></div>
55	55	<div class="gdmbx-td">
56		- <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr( $invoice->last_name );?>" />
	56	+ <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr($invoice->last_name); ?>" />
57	57	</div>
58	58	</div>
59	59	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-company table-layout">
60		- <div class="gdmbx-th"><label for="wpinv_company"><?php _e( 'Company', 'invoicing' );?></label></div>
	60	+ <div class="gdmbx-th"><label for="wpinv_company"><?php _e('Company', 'invoicing'); ?></label></div>
61	61	<div class="gdmbx-td">
62		- <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr( $invoice->company );?>" />
	62	+ <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr($invoice->company); ?>" />
63	63	</div>
64	64	</div>
65	65	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-vat-number table-layout">
66		- <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e( 'Vat Number', 'invoicing' );?></label></div>
	66	+ <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e('Vat Number', 'invoicing'); ?></label></div>
67	67	<div class="gdmbx-td">
68		- <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr( $invoice->vat_number );?>" />
	68	+ <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr($invoice->vat_number); ?>" />
69	69	</div>
70	70	</div>
71	71	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-address table-layout">
72		- <div class="gdmbx-th"><label for="wpinv_address"><?php _e( 'Address', 'invoicing' );?></label></div>
	72	+ <div class="gdmbx-th"><label for="wpinv_address"><?php _e('Address', 'invoicing'); ?></label></div>
73	73	<div class="gdmbx-td">
74		- <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr( $invoice->address );?>" />
	74	+ <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr($invoice->address); ?>" />
75	75	</div>
76	76	</div>
77	77	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-city table-layout">
78		- <div class="gdmbx-th"><label for="wpinv_city"><?php _e( 'City', 'invoicing' );?></label></div>
	78	+ <div class="gdmbx-th"><label for="wpinv_city"><?php _e('City', 'invoicing'); ?></label></div>
79	79	<div class="gdmbx-td">
80		- <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr( $invoice->city );?>" />
	80	+ <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr($invoice->city); ?>" />
81	81	</div>
82	82	</div>
83	83	<div class="gdmbx-row gdmbx-type-select gdmbx-wpinv-country table-layout">
84		- <div class="gdmbx-th"><label for="wpinv_country"><?php _e( 'Country', 'invoicing' );?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
	84	+ <div class="gdmbx-th"><label for="wpinv_country"><?php _e('Country', 'invoicing'); ?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
85	85	<div class="gdmbx-td">
86	86	<?php
87		- echo wpinv_html_select( array(
88		- 'options' => array_merge( array( '' => __( 'Choose a country', 'invoicing' ) ), wpinv_get_country_list() ),
	87	+ echo wpinv_html_select(array(
	88	+ 'options' => array_merge(array('' => __('Choose a country', 'invoicing')), wpinv_get_country_list()),
89	89	'name' => 'wpinv_country',
90	90	'id' => 'wpinv_country',
91	91	'selected' => $invoice->country,
		@@ -93,20 +93,20 @@ discard block
		block discarded – undo
93	93	'show_option_none' => false,
94	94	'class' => 'gdmbx2-text-large',
95	95	'chosen' => false,
96		- 'placeholder' => __( 'Choose a country', 'invoicing' ),
	96	+ 'placeholder' => __('Choose a country', 'invoicing'),
97	97	'required' => false,
98		- ) );
	98	+ ));
99	99	?>
100	100	</div>
101	101	</div>
102	102	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-state table-layout">
103		- <div class="gdmbx-th"><label for="wpinv_state"><?php _e( 'State', 'invoicing' );?></label></div>
	103	+ <div class="gdmbx-th"><label for="wpinv_state"><?php _e('State', 'invoicing'); ?></label></div>
104	104	<div class="gdmbx-td">
105	105	<?php
106		- $states = wpinv_get_country_states( $invoice->country );
107		- if( !empty( $states ) ) {
108		- echo wpinv_html_select( array(
109		- 'options' => array_merge( array( '' => __( 'Choose a state', 'invoicing' ) ), $states ),
	106	+ $states = wpinv_get_country_states($invoice->country);
	107	+ if (!empty($states)) {
	108	+ echo wpinv_html_select(array(
	109	+ 'options' => array_merge(array('' => __('Choose a state', 'invoicing')), $states),
110	110	'name' => 'wpinv_state',
111	111	'id' => 'wpinv_state',
112	112	'selected' => $invoice->state,
		@@ -114,44 +114,44 @@ discard block
		block discarded – undo
114	114	'show_option_none' => false,
115	115	'class' => 'gdmbx2-text-large',
116	116	'chosen' => false,
117		- 'placeholder' => __( 'Choose a state', 'invoicing' ),
	117	+ 'placeholder' => __('Choose a state', 'invoicing'),
118	118	'required' => false,
119		- ) );
	119	+ ));
120	120	} else {
121		- echo wpinv_html_text( array(
	121	+ echo wpinv_html_text(array(
122	122	'name' => 'wpinv_state',
123		- 'value' => ! empty( $invoice->state ) ? $invoice->state : '',
	123	+ 'value' => !empty($invoice->state) ? $invoice->state : '',
124	124	'id' => 'wpinv_state',
125	125	'class' => 'gdmbx2-text-large',
126	126	'required' => false,
127		- ) );
	127	+ ));
128	128	}
129	129	?>
130	130	</div>
131	131	</div>
132	132	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-zip table-layout">
133		- <div class="gdmbx-th"><label for="wpinv_zip"><?php _e( 'Zipcode', 'invoicing' );?></label></div>
	133	+ <div class="gdmbx-th"><label for="wpinv_zip"><?php _e('Zipcode', 'invoicing'); ?></label></div>
134	134	<div class="gdmbx-td">
135		- <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr( $invoice->zip );?>" />
	135	+ <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr($invoice->zip); ?>" />
136	136	</div>
137	137	</div>
138	138	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-phone table-layout">
139		- <div class="gdmbx-th"><label for="wpinv_phone"><?php _e( 'Phone', 'invoicing' );?></label></div>
	139	+ <div class="gdmbx-th"><label for="wpinv_phone"><?php _e('Phone', 'invoicing'); ?></label></div>
140	140	<div class="gdmbx-td">
141		- <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr( $invoice->phone );?>" />
	141	+ <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr($invoice->phone); ?>" />
142	142	</div>
143	143	</div>
144	144	<div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-ip table-layout">
145		- <div class="gdmbx-th"><label for="wpinv_ip"><?php _e( 'IP Address', 'invoicing' );?><?php if ($invoice->ip) { ?>
146		-   <a href="<?php echo admin_url( 'admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip ); ?>" title="<?php esc_attr_e( 'View IP information', 'invoicing' );?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
	145	+ <div class="gdmbx-th"><label for="wpinv_ip"><?php _e('IP Address', 'invoicing'); ?><?php if ($invoice->ip) { ?>
	146	+   <a href="<?php echo admin_url('admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip); ?>" title="<?php esc_attr_e('View IP information', 'invoicing'); ?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
147	147	<?php } ?></label></div>
148	148	<div class="gdmbx-td">
149		- <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr( $invoice->ip );?>" readonly />
	149	+ <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr($invoice->ip); ?>" readonly />
150	150	</div>
151	151	</div>
152	152	</div>
153	153	</div>
154		-<?php wp_nonce_field( 'wpinv_save_invoice', 'wpinv_save_invoice' ) ;?>
	154	+<?php wp_nonce_field('wpinv_save_invoice', 'wpinv_save_invoice'); ?>
155	155	<?php
156	156	}
157	157	}

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2	if ( ! defined( 'ABSPATH' ) ) {
3		- exit;
	3	+ exit;
4	4	}
5	5
6	6	if ( !( $user_id = get_current_user_id() ) ) {
		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30
31	31	<tbody>
32	32	<?php foreach ( $user_invoices->invoices as $invoice ) {
33		- ?>
	33	+ ?>
34	34	<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
35	35	<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
36	36	<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
		@@ -53,31 +53,31 @@ discard block
		block discarded – undo
53	53
54	54	<?php elseif ( 'invoice-actions' === $column_id ) : ?>
55	55	<?php
56		- $actions = array(
57		- 'pay' => array(
58		- 'url' => $invoice->get_checkout_payment_url(),
59		- 'name' => __( 'Pay Now', 'invoicing' ),
	56	+ $actions = array(
	57	+ 'pay' => array(
	58	+ 'url' => $invoice->get_checkout_payment_url(),
	59	+ 'name' => __( 'Pay Now', 'invoicing' ),
60	60	'class' => 'btn-success'
61		- ),
	61	+ ),
62	62	'print' => array(
63		- 'url' => $invoice->get_view_url(),
64		- 'name' => __( 'Print', 'invoicing' ),
	63	+ 'url' => $invoice->get_view_url(),
	64	+ 'name' => __( 'Print', 'invoicing' ),
65	65	'class' => 'btn-primary',
66	66	'attrs' => 'target="_blank"'
67		- )
68		- );
	67	+ )
	68	+ );
69	69
70		- if ( ! $invoice->needs_payment() ) {
71		- unset( $actions['pay'] );
72		- }
	70	+ if ( ! $invoice->needs_payment() ) {
	71	+ unset( $actions['pay'] );
	72	+ }
73	73
74		- if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
75		- foreach ( $actions as $key => $action ) {
76		- $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
	74	+ if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
	75	+ foreach ( $actions as $key => $action ) {
	76	+ $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
77	77	echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
78		- }
79		- }
80		- ?>
	78	+ }
	79	+ }
	80	+ ?>
81	81	<?php endif; ?>
82	82	</td>
83	83	<?php endforeach; ?>
		@@ -91,26 +91,26 @@ discard block
		block discarded – undo
91	91	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
92	92	<div class="invoicing-Pagination">
93	93	<?php
94		- $big = 999999;
95		- $wpinv_cpt = isset($_REQUEST['wpinv-cpt']) ? $_REQUEST['wpinv-cpt'] : '';
96		-
97		- if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt)
98		- $current_page = get_query_var('paged');
99		- elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt)
100		- $current_page = get_query_var('page');
101		- else
102		- $current_page = 1;
103		-
104		- echo paginate_links( array(
105		- 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
106		- 'format' => '?paged=%#%',
107		- 'current' => max( 1, $current_page ),
108		- 'total' => $user_invoices->max_num_pages,
109		- 'add_args' => array(
110		- 'wpinv-cpt' => 'wpi_invoice',
111		- )
112		- ) );
113		- ?>
	94	+ $big = 999999;
	95	+ $wpinv_cpt = isset($_REQUEST['wpinv-cpt']) ? $_REQUEST['wpinv-cpt'] : '';
	96	+
	97	+ if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt)
	98	+ $current_page = get_query_var('paged');
	99	+ elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt)
	100	+ $current_page = get_query_var('page');
	101	+ else
	102	+ $current_page = 1;
	103	+
	104	+ echo paginate_links( array(
	105	+ 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
	106	+ 'format' => '?paged=%#%',
	107	+ 'current' => max( 1, $current_page ),
	108	+ 'total' => $user_invoices->max_num_pages,
	109	+ 'add_args' => array(
	110	+ 'wpinv-cpt' => 'wpi_invoice',
	111	+ )
	112	+ ) );
	113	+ ?>
114	114	</div>
115	115	<?php endif; ?>
116	116

		@@ -1,80 +1,80 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) {
	2	+if (!defined('ABSPATH')) {
3	3	exit;
4	4	}
5	5
6		-if ( !( $user_id = get_current_user_id() ) ) {
	6	+if (!($user_id = get_current_user_id())) {
7	7	?>
8		- <div class="wpinv-empty alert alert-error"><?php _e( 'You are not allowed to access this section', 'invoicing' ) ;?></div>
	8	+ <div class="wpinv-empty alert alert-error"><?php _e('You are not allowed to access this section', 'invoicing'); ?></div>
9	9	<?php
10	10	return;
11	11	}
12	12
13	13	global $current_page;
14		-$current_page = empty( $current_page ) ? 1 : absint( $current_page );
15		-$query = apply_filters( 'wpinv_user_invoices_query', array( 'user' => $user_id, 'page' => $current_page, 'paginate' => true ) );
16		-$user_invoices = wpinv_get_invoices( $query );
	14	+$current_page = empty($current_page) ? 1 : absint($current_page);
	15	+$query = apply_filters('wpinv_user_invoices_query', array('user' => $user_id, 'page' => $current_page, 'paginate' => true));
	16	+$user_invoices = wpinv_get_invoices($query);
17	17	$has_invoices = 0 < $user_invoices->total;
18	18
19		-do_action( 'wpinv_before_user_invoices', $has_invoices ); ?>
	19	+do_action('wpinv_before_user_invoices', $has_invoices); ?>
20	20
21		-<?php if ( $has_invoices ) { ?>
	21	+<?php if ($has_invoices) { ?>
22	22	<table class="table table-bordered table-hover wpi-user-invoices">
23	23	<thead>
24	24	<tr>
25		- <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
26		- <th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
	25	+ <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
	26	+ <th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
27	27	<?php endforeach; ?>
28	28	</tr>
29	29	</thead>
30	30
31	31	<tbody>
32		- <?php foreach ( $user_invoices->invoices as $invoice ) {
	32	+ <?php foreach ($user_invoices->invoices as $invoice) {
33	33	?>
34	34	<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
35		- <?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
36		- <td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
37		- <?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
38		- <?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
39		-
40		- <?php elseif ( 'invoice-number' === $column_id ) : ?>
41		- <a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
42		- <?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
	35	+ <?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
	36	+ <td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
	37	+ <?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
	38	+ <?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
	39	+
	40	+ <?php elseif ('invoice-number' === $column_id) : ?>
	41	+ <a href="<?php echo esc_url($invoice->get_view_url()); ?>">
	42	+ <?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
43	43	</a>
44	44
45		- <?php elseif ( 'invoice-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s' ); ?>
46		- <time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
	45	+ <?php elseif ('invoice-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s'); ?>
	46	+ <time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
47	47
48		- <?php elseif ( 'invoice-status' === $column_id ) : ?>
49		- <?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
	48	+ <?php elseif ('invoice-status' === $column_id) : ?>
	49	+ <?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
50	50
51		- <?php elseif ( 'invoice-total' === $column_id ) : ?>
52		- <?php echo $invoice->get_total( true ); ?>
	51	+ <?php elseif ('invoice-total' === $column_id) : ?>
	52	+ <?php echo $invoice->get_total(true); ?>
53	53
54		- <?php elseif ( 'invoice-actions' === $column_id ) : ?>
	54	+ <?php elseif ('invoice-actions' === $column_id) : ?>
55	55	<?php
56	56	$actions = array(
57	57	'pay' => array(
58	58	'url' => $invoice->get_checkout_payment_url(),
59		- 'name' => __( 'Pay Now', 'invoicing' ),
	59	+ 'name' => __('Pay Now', 'invoicing'),
60	60	'class' => 'btn-success'
61	61	),
62	62	'print' => array(
63	63	'url' => $invoice->get_view_url(),
64		- 'name' => __( 'Print', 'invoicing' ),
	64	+ 'name' => __('Print', 'invoicing'),
65	65	'class' => 'btn-primary',
66	66	'attrs' => 'target="_blank"'
67	67	)
68	68	);
69	69
70		- if ( ! $invoice->needs_payment() ) {
71		- unset( $actions['pay'] );
	70	+ if (!$invoice->needs_payment()) {
	71	+ unset($actions['pay']);
72	72	}
73	73
74		- if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
75		- foreach ( $actions as $key => $action ) {
	74	+ if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
	75	+ foreach ($actions as $key => $action) {
76	76	$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
77		- echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
	77	+ echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
78	78	}
79	79	}
80	80	?>
		@@ -86,9 +86,9 @@ discard block
		block discarded – undo
86	86	</tbody>
87	87	</table>
88	88
89		- <?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
	89	+ <?php do_action('wpinv_before_user_invoices_pagination'); ?>
90	90
91		- <?php if ( 1 < $user_invoices->max_num_pages ) : ?>
	91	+ <?php if (1 < $user_invoices->max_num_pages) : ?>
92	92	<div class="invoicing-Pagination">
93	93	<?php
94	94	$big = 999999;
		@@ -101,23 +101,23 @@ discard block
		block discarded – undo
101	101	else
102	102	$current_page = 1;
103	103
104		- echo paginate_links( array(
105		- 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
	104	+ echo paginate_links(array(
	105	+ 'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
106	106	'format' => '?paged=%#%',
107		- 'current' => max( 1, $current_page ),
	107	+ 'current' => max(1, $current_page),
108	108	'total' => $user_invoices->max_num_pages,
109	109	'add_args' => array(
110	110	'wpinv-cpt' => 'wpi_invoice',
111	111	)
112		- ) );
	112	+ ));
113	113	?>
114	114	</div>
115	115	<?php endif; ?>
116	116
117	117	<?php } else { ?>
118	118	<div class="wpinv-empty alert-info">
119		- <?php _e( 'No invoice has been made yet.', 'invoicing' ); ?>
	119	+ <?php _e('No invoice has been made yet.', 'invoicing'); ?>
120	120	</div>
121	121	<?php } ?>
122	122
123		-<?php do_action( 'wpinv_after_user_invoices', $has_invoices ); ?>
	123	+<?php do_action('wpinv_after_user_invoices', $has_invoices); ?>

		@@ -94,12 +94,13 @@
		block discarded – undo
94	94	$big = 999999;
95	95	$wpinv_cpt = isset($_REQUEST['wpinv-cpt']) ? $_REQUEST['wpinv-cpt'] : '';
96	96
97		- if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt)
98		- $current_page = get_query_var('paged');
99		- elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt)
100		- $current_page = get_query_var('page');
101		- else
102		- $current_page = 1;
	97	+ if (get_query_var('paged') && 'wpi_invoice' == $wpinv_cpt) {
	98	+ $current_page = get_query_var('paged');
	99	+ } elseif (get_query_var('page') && 'wpi_invoice' == $wpinv_cpt) {
	100	+ $current_page = get_query_var('page');
	101	+ } else {
	102	+ $current_page = 1;
	103	+ }
103	104
104	105	echo paginate_links( array(
105	106	'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) {
	2	+if (!defined('ABSPATH')) {
3	3	exit; // Exit if accessed directly
4	4	}
5	5
		@@ -14,73 +14,73 @@ discard block
		block discarded – undo
14	14	}
15	15
16	16	public function init() {
17		- do_action( 'wpinv_class_notes_init', $this );
	17	+ do_action('wpinv_class_notes_init', $this);
18	18	}
19	19
20	20	public function includes() {
21		- do_action( 'wpinv_class_notes_includes', $this );
	21	+ do_action('wpinv_class_notes_includes', $this);
22	22	}
23	23
24	24	public function actions() {
25	25	// Secure inovice notes
26		- add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
	26	+ add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
27	27
28	28	// Count comments
29		- add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 11, 2 );
	29	+ add_filter('wp_count_comments', array($this, 'wp_count_comments'), 11, 2);
30	30
31	31	// Delete comments count cache whenever there is a new comment or a comment status changes
32		- add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
33		- add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
	32	+ add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
	33	+ add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
34	34
35		- do_action( 'wpinv_class_notes_actions', $this );
	35	+ do_action('wpinv_class_notes_actions', $this);
36	36	}
37	37
38		- public function set_invoice_note_type( $query ) {
39		- $post_ID = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
	38	+ public function set_invoice_note_type($query) {
	39	+ $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
40	40
41		- if ( $post_ID && in_array(get_post_type( $post_ID ), array($this->invoice_post_type, 'wpi_quote' )) ) {
	41	+ if ($post_ID && in_array(get_post_type($post_ID), array($this->invoice_post_type, 'wpi_quote'))) {
42	42	$query->query_vars['type__in'] = $this->comment_type;
43	43	$query->query_vars['type__not_in'] = '';
44	44	} else {
45		- if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
46		- if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
47		- $key = array_search( $this->comment_type, $type_in );
48		- unset( $query->query_vars['type__in'][$key] );
49		- } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
	45	+ if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
	46	+ if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
	47	+ $key = array_search($this->comment_type, $type_in);
	48	+ unset($query->query_vars['type__in'][$key]);
	49	+ } else if (!is_array($type_in) && $type_in == $this->comment_type) {
50	50	$query->query_vars['type__in'] = '';
51	51	}
52	52	}
53	53
54		- if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
55		- if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
	54	+ if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
	55	+ if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
56	56	$query->query_vars['type__not_in'][] = $this->comment_type;
57		- } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
	57	+ } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
58	58	$query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
59	59	$query->query_vars['type__not_in'][] = $this->comment_type;
60	60	}
61	61	} else {
62		- $query->query_vars['type__not_in'] = $this->comment_type;
	62	+ $query->query_vars['type__not_in'] = $this->comment_type;
63	63	}
64	64	}
65	65
66	66	return $query;
67	67	}
68	68
69		- public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
	69	+ public function get_invoice_notes($invoice_id = 0, $type = '') {
70	70	$args = array(
71	71	'post_id' => $invoice_id,
72	72	'orderby' => 'comment_ID',
73	73	'order' => 'ASC',
74	74	);
75	75
76		- if ( $type == 'customer' ) {
	76	+ if ($type == 'customer') {
77	77	$args['meta_key'] = '_wpi_customer_note';
78	78	$args['meta_value'] = 1;
79	79	}
80	80
81		- $args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
	81	+ $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
82	82
83		- return get_comments( $args );
	83	+ return get_comments($args);
84	84	}
85	85
86	86	/**
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	* @return void
92	92	*/
93	93	public function delete_comments_count_cache() {
94		- delete_transient( 'wpinv_count_comments' );
	94	+ delete_transient('wpinv_count_comments');
95	95	}
96	96
97	97	/**
		@@ -102,16 +102,16 @@ discard block
		block discarded – undo
102	102	* @param int $post_id Post ID.
103	103	* @return object
104	104	*/
105		- public function wp_count_comments( $stats, $post_id ) {
	105	+ public function wp_count_comments($stats, $post_id) {
106	106	global $wpdb;
107	107
108		- if ( 0 === $post_id ) {
109		- $stats = get_transient( 'wpinv_count_comments' );
	108	+ if (0 === $post_id) {
	109	+ $stats = get_transient('wpinv_count_comments');
110	110
111		- if ( ! $stats ) {
	111	+ if (!$stats) {
112	112	$stats = array();
113	113
114		- $count = $wpdb->get_results( "SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A );
	114	+ $count = $wpdb->get_results("SELECT comment_approved, COUNT(*) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN ('" . $this->comment_type . "') GROUP BY comment_approved", ARRAY_A);
115	115
116	116	$total = 0;
117	117	$approved = array(
		@@ -122,26 +122,26 @@ discard block
		block discarded – undo
122	122	'post-trashed' => 'post-trashed',
123	123	);
124	124
125		- foreach ( (array) $count as $row ) {
	125	+ foreach ((array)$count as $row) {
126	126	// Do not count post-trashed toward totals.
127		- if ( 'post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved'] ) {
	127	+ if ('post-trashed' !== $row['comment_approved'] && 'trash' !== $row['comment_approved']) {
128	128	$total += $row['num_comments'];
129	129	}
130		- if ( isset( $approved[ $row['comment_approved'] ] ) ) {
131		- $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
	130	+ if (isset($approved[$row['comment_approved']])) {
	131	+ $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
132	132	}
133	133	}
134	134
135	135	$stats['total_comments'] = $total;
136	136	$stats['all'] = $total;
137		- foreach ( $approved as $key ) {
138		- if ( empty( $stats[ $key ] ) ) {
139		- $stats[ $key ] = 0;
	137	+ foreach ($approved as $key) {
	138	+ if (empty($stats[$key])) {
	139	+ $stats[$key] = 0;
140	140	}
141	141	}
142	142
143		- $stats = (object) $stats;
144		- set_transient( 'wpinv_count_comments', $stats );
	143	+ $stats = (object)$stats;
	144	+ set_transient('wpinv_count_comments', $stats);
145	145	}
146	146	}
147	147

AyeCode / invoicing

Push — master ( b0d50b...dd166b )

Status

Category

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Spacing +266 added lines, -266 removed lines patch added patch discarded remove patch

Spacing +160 added lines, -160 removed lines patch added patch discarded remove patch

Doc Comments +8 added lines patch added patch discarded remove patch

Spacing +67 added lines, -67 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Braces +7 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch