AyeCode / invoicing

includes/api/class-wpinv-rest-invoice-controller.php

Indentation +129 added lines, -129 removed lines

@@ -15,136 +15,136 @@
 class WPInv_REST_Invoice_Controller extends GetPaid_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_invoice';
-
-	/**
-	 * The base of this controller's route.
-	 *
-	 * @since 1.0.13
-	 * @var string
-	 */
-	protected $rest_base = 'invoices';
-
-	/** Contains this controller's class name.
-	 *
-	 * @var string
-	 */
-	public $crud_class = 'WPInv_Invoice';
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_invoice';
 
     /**
-	 * Retrieves the query params for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
-
-		$params = array_merge(
-
-			parent::get_collection_params(),
-
-			array(
-
-
-				'customers' => array(
-					'description'       => __( 'Limit result set to invoices for specific user ids.', 'invoicing' ),
-					'type'              => 'array',
-					'items'             => array(
-						'type'          => 'integer',
-					),
-					'default'           => array(),
-					'sanitize_callback' => 'wp_parse_id_list',
-				),
-
-				'exclude_customers'  	=> array(
-					'description' 		=> __( 'Exclude invoices to specific users.', 'invoicing' ),
-					'type'        		=> 'array',
-					'items'       		=> array(
-						'type'          => 'integer',
-					),
-					'default'     		=> array(),
-					'sanitize_callback' => 'wp_parse_id_list',
-				),
-
-				'parent'  	            => array(
-					'description'       => __( 'Limit result set to those of particular parent IDs.', 'invoicing' ),
-					'type'              => 'array',
-					'items'             => array(
-						'type'          => 'integer',
-					),
-					'sanitize_callback' => 'wp_parse_id_list',
-					'default'           => array(),
-				),
-
-				'parent_exclude'  	    => array(
-					'description'       => __( 'Limit result set to all items except those of a particular parent ID.', 'invoicing' ),
-					'type'              => 'array',
-					'items'             => array(
-						'type'          => 'integer',
-					),
-					'sanitize_callback' => 'wp_parse_id_list',
-					'default'           => array(),
-				),
-
-			)
-
-		);
-
-		// Filter collection parameters for the invoices controller.
-		return apply_filters( 'getpaid_rest_invoices_collection_params', $params, $this );
-	}
-
-	/**
-	 * Determine the allowed query_vars for a get_items() response and
-	 * prepare for WP_Query.
-	 *
-	 * @param array           $prepared_args Prepared arguments.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array          $query_args
-	 */
-	protected function prepare_items_query( $prepared_args = array(), $request = null ) {
-
-		$query_args = parent::prepare_items_query( $prepared_args );
-
-		// Retrieve invoices for specific customers.
-		if ( ! empty( $request['customers'] ) ) {
-			$query_args['author__in'] = $request['customers'];
-		}
-
-		// Skip invoices for specific customers.
-		if ( ! empty( $request['exclude_customers'] ) ) {
-			$query_args['author__not_in'] = $request['exclude_customers'];
-		}
-
-		return apply_filters( 'getpaid_rest_invoices_prepare_items_query', $query_args, $request, $this );
-
-	}
-
-	/**
-	 * Retrieves a valid list of post statuses.
-	 *
-	 * @since 1.0.15
-	 *
-	 * @return array A list of registered item statuses.
-	 */
-	public function get_post_statuses() {
-		return array_keys( wpinv_get_invoice_statuses( true, false, $this->post_type ) );
-	}
-
-	/**
-	 * Saves a single invoice.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice to save.
-	 * @return WP_Error|WPInv_Invoice
-	 */
-	protected function save_object( $invoice ) {
-		$invoice->recalculate_total();
-		return parent::save_object( $invoice );
-	}
+     * The base of this controller's route.
+     *
+     * @since 1.0.13
+     * @var string
+     */
+    protected $rest_base = 'invoices';
+
+    /** Contains this controller's class name.
+     *
+     * @var string
+     */
+    public $crud_class = 'WPInv_Invoice';
+
+    /**
+     * Retrieves the query params for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
+
+        $params = array_merge(
+
+            parent::get_collection_params(),
+
+            array(
+
+
+                'customers' => array(
+                    'description'       => __( 'Limit result set to invoices for specific user ids.', 'invoicing' ),
+                    'type'              => 'array',
+                    'items'             => array(
+                        'type'          => 'integer',
+                    ),
+                    'default'           => array(),
+                    'sanitize_callback' => 'wp_parse_id_list',
+                ),
+
+                'exclude_customers'  	=> array(
+                    'description' 		=> __( 'Exclude invoices to specific users.', 'invoicing' ),
+                    'type'        		=> 'array',
+                    'items'       		=> array(
+                        'type'          => 'integer',
+                    ),
+                    'default'     		=> array(),
+                    'sanitize_callback' => 'wp_parse_id_list',
+                ),
+
+                'parent'  	            => array(
+                    'description'       => __( 'Limit result set to those of particular parent IDs.', 'invoicing' ),
+                    'type'              => 'array',
+                    'items'             => array(
+                        'type'          => 'integer',
+                    ),
+                    'sanitize_callback' => 'wp_parse_id_list',
+                    'default'           => array(),
+                ),
+
+                'parent_exclude'  	    => array(
+                    'description'       => __( 'Limit result set to all items except those of a particular parent ID.', 'invoicing' ),
+                    'type'              => 'array',
+                    'items'             => array(
+                        'type'          => 'integer',
+                    ),
+                    'sanitize_callback' => 'wp_parse_id_list',
+                    'default'           => array(),
+                ),
+
+            )
+
+        );
+
+        // Filter collection parameters for the invoices controller.
+        return apply_filters( 'getpaid_rest_invoices_collection_params', $params, $this );
+    }
+
+    /**
+     * Determine the allowed query_vars for a get_items() response and
+     * prepare for WP_Query.
+     *
+     * @param array           $prepared_args Prepared arguments.
+     * @param WP_REST_Request $request Request object.
+     * @return array          $query_args
+     */
+    protected function prepare_items_query( $prepared_args = array(), $request = null ) {
+
+        $query_args = parent::prepare_items_query( $prepared_args );
+
+        // Retrieve invoices for specific customers.
+        if ( ! empty( $request['customers'] ) ) {
+            $query_args['author__in'] = $request['customers'];
+        }
+
+        // Skip invoices for specific customers.
+        if ( ! empty( $request['exclude_customers'] ) ) {
+            $query_args['author__not_in'] = $request['exclude_customers'];
+        }
+
+        return apply_filters( 'getpaid_rest_invoices_prepare_items_query', $query_args, $request, $this );
+
+    }
+
+    /**
+     * Retrieves a valid list of post statuses.
+     *
+     * @since 1.0.15
+     *
+     * @return array A list of registered item statuses.
+     */
+    public function get_post_statuses() {
+        return array_keys( wpinv_get_invoice_statuses( true, false, $this->post_type ) );
+    }
+
+    /**
+     * Saves a single invoice.
+     *
+     * @param WPInv_Invoice $invoice Invoice to save.
+     * @return WP_Error|WPInv_Invoice
+     */
+    protected function save_object( $invoice ) {
+        $invoice->recalculate_total();
+        return parent::save_object( $invoice );
+    }
 
 }

includes/wpinv-template-functions.php

Indentation +102 added lines, -102 removed lines

@@ -140,7 +140,7 @@ 
  * @param string $default_path The root path to the default template. Defaults to invoicing/templates
  */
 function wpinv_get_template_html( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-	return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
+    return getpaid_template()->get_template( $template_name, $args, $template_path, $default_path );
 }
 
 /**
@@ -158,7 +158,7 @@ 
  * @return string
  */
 function wpinv_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
+    return trailingslashit( apply_filters( 'wpinv_templates_dir', 'invoicing' ) );
 }
 
 /**
@@ -175,122 +175,122 @@ 
 }
 
 function wpinv_get_template_part( $slug, $name = null, $load = true ) {
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+    do_action( 'get_template_part_' . $slug, $slug, $name );
 
-	// Setup possible parts
-	$templates = array();
-	if ( isset( $name ) )
-		$templates[] = $slug . '-' . $name . '.php';
-	$templates[] = $slug . '.php';
+    // Setup possible parts
+    $templates = array();
+    if ( isset( $name ) )
+        $templates[] = $slug . '-' . $name . '.php';
+    $templates[] = $slug . '.php';
 
-	// Allow template parts to be filtered
-	$templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
+    // Allow template parts to be filtered
+    $templates = apply_filters( 'wpinv_get_template_part', $templates, $slug, $name );
 
-	// Return the part that is found
-	return wpinv_locate_tmpl( $templates, $load, false );
+    // Return the part that is found
+    return wpinv_locate_tmpl( $templates, $load, false );
 }
 
 function wpinv_locate_tmpl( $template_names, $load = false, $require_once = true ) {
-	// No file found yet
-	$located = false;
+    // No file found yet
+    $located = false;
 
-	// Try to find a template file
-	foreach ( (array)$template_names as $template_name ) {
+    // Try to find a template file
+    foreach ( (array)$template_names as $template_name ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) )
-			continue;
+        // Continue if template is empty
+        if ( empty( $template_name ) )
+            continue;
 
-		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+        // Trim off any slashes from the template name
+        $template_name = ltrim( $template_name, '/' );
 
-		// try locating this template file by looping through the template paths
-		foreach( wpinv_get_theme_template_paths() as $template_path ) {
+        // try locating this template file by looping through the template paths
+        foreach( wpinv_get_theme_template_paths() as $template_path ) {
 
-			if( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
-				break;
-			}
-		}
+            if( file_exists( $template_path . $template_name ) ) {
+                $located = $template_path . $template_name;
+                break;
+            }
+        }
 
-		if( !empty( $located ) ) {
-			break;
-		}
-	}
+        if( !empty( $located ) ) {
+            break;
+        }
+    }
 
-	if ( ( true == $load ) && ! empty( $located ) )
-		load_template( $located, $require_once );
+    if ( ( true == $load ) && ! empty( $located ) )
+        load_template( $located, $require_once );
 
-	return $located;
+    return $located;
 }
 
 function wpinv_get_theme_template_paths() {
-	$template_dir = wpinv_get_theme_template_dir_name();
+    $template_dir = wpinv_get_theme_template_dir_name();
 
-	$file_paths = array(
-		1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10 => trailingslashit( get_template_directory() ) . $template_dir,
-		100 => wpinv_get_templates_dir()
-	);
+    $file_paths = array(
+        1 => trailingslashit( get_stylesheet_directory() ) . $template_dir,
+        10 => trailingslashit( get_template_directory() ) . $template_dir,
+        100 => wpinv_get_templates_dir()
+    );
 
-	$file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
+    $file_paths = apply_filters( 'wpinv_template_paths', $file_paths );
 
-	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+    // sort the file paths based on priority
+    ksort( $file_paths, SORT_NUMERIC );
 
-	return array_map( 'trailingslashit', $file_paths );
+    return array_map( 'trailingslashit', $file_paths );
 }
 
 function wpinv_checkout_meta_tags() {
 
-	$pages   = array();
-	$pages[] = wpinv_get_option( 'success_page' );
-	$pages[] = wpinv_get_option( 'failure_page' );
-	$pages[] = wpinv_get_option( 'invoice_history_page' );
-	$pages[] = wpinv_get_option( 'invoice_subscription_page' );
+    $pages   = array();
+    $pages[] = wpinv_get_option( 'success_page' );
+    $pages[] = wpinv_get_option( 'failure_page' );
+    $pages[] = wpinv_get_option( 'invoice_history_page' );
+    $pages[] = wpinv_get_option( 'invoice_subscription_page' );
 
-	if( !wpinv_is_checkout() && !is_page( $pages ) ) {
-		return;
-	}
+    if( !wpinv_is_checkout() && !is_page( $pages ) ) {
+        return;
+    }
 
-	echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
+    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
 }
 add_action( 'wp_head', 'wpinv_checkout_meta_tags' );
 
 function wpinv_add_body_classes( $class ) {
-	$classes = (array)$class;
+    $classes = (array)$class;
 
-	if( wpinv_is_checkout() ) {
-		$classes[] = 'wpinv-checkout';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_checkout() ) {
+        $classes[] = 'wpinv-checkout';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_success_page() ) {
-		$classes[] = 'wpinv-success';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_success_page() ) {
+        $classes[] = 'wpinv-success';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_failed_transaction_page() ) {
-		$classes[] = 'wpinv-failed-transaction';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_failed_transaction_page() ) {
+        $classes[] = 'wpinv-failed-transaction';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_invoice_history_page() ) {
-		$classes[] = 'wpinv-history';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_invoice_history_page() ) {
+        $classes[] = 'wpinv-history';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_subscriptions_history_page() ) {
-		$classes[] = 'wpinv-subscription';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_subscriptions_history_page() ) {
+        $classes[] = 'wpinv-subscription';
+        $classes[] = 'wpinv-page';
+    }
 
-	if( wpinv_is_test_mode() ) {
-		$classes[] = 'wpinv-test-mode';
-		$classes[] = 'wpinv-page';
-	}
+    if( wpinv_is_test_mode() ) {
+        $classes[] = 'wpinv-test-mode';
+        $classes[] = 'wpinv-page';
+    }
 
-	return array_unique( $classes );
+    return array_unique( $classes );
 }
 add_filter( 'body_class', 'wpinv_add_body_classes' );
 
@@ -859,21 +859,21 @@ 
 
     $formatted_address = str_ireplace( array_keys( $replacements ), $replacements, $format );
     
-	// Remove unavailable tags.
+    // Remove unavailable tags.
     $formatted_address = preg_replace( "/\{\{\w+\}\}/", '', $formatted_address );
 
     // Clean up white space.
-	$formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
+    $formatted_address = preg_replace( '/  +/', ' ', trim( $formatted_address ) );
     $formatted_address = preg_replace( '/\n\n+/', "\n", $formatted_address );
     
     // Break newlines apart and remove empty lines/trim commas and white space.
-	$formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
+    $formatted_address = array_filter( array_map( 'wpinv_trim_formatted_address_line', explode( "\n", $formatted_address ) ) );
 
     // Add html breaks.
-	$formatted_address = implode( $separator, $formatted_address );
+    $formatted_address = implode( $separator, $formatted_address );
 
-	// We're done!
-	return $formatted_address;
+    // We're done!
+    return $formatted_address;
     
 }
 
@@ -1075,7 +1075,7 @@ 
 }
 
 function wpinv_empty_cart_message() {
-	return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
+    return apply_filters( 'wpinv_empty_cart_message', '<span class="wpinv_empty_cart">' . __( 'Your cart is empty.', 'invoicing' ) . '</span>' );
 }
 
 /**
@@ -1343,10 +1343,10 @@ 
 
     if ( 0 == count( $form->get_items() ) ) {
         echo aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'No published items found', 'invoicing' ),
-			)
+            array(
+                'type'    => 'warning',
+                'content' => __( 'No published items found', 'invoicing' ),
+            )
         );
         return;
     }
@@ -1364,21 +1364,21 @@ 
     $invoice = wpinv_get_invoice( $invoice_id );
 
     if ( empty( $invoice ) ) {
-		echo aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'Invoice not found', 'invoicing' ),
-			)
+        echo aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'Invoice not found', 'invoicing' ),
+            )
         );
         return;
     }
 
     if ( $invoice->is_paid() ) {
-		echo aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'Invoice has already been paid', 'invoicing' ),
-			)
+        echo aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'Invoice has already been paid', 'invoicing' ),
+            )
         );
         return;
     }
@@ -1440,7 +1440,7 @@ 
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-form='$form'>$label</button>"; 
     }
 	
-	if ( ! empty( $items ) ) {
+    if ( ! empty( $items ) ) {
         $items  = esc_attr( $items );
         return "<button class='btn btn-primary getpaid-payment-button' type='button' data-item='$items'>$label</button>"; 
     }

includes/wpinv-address-functions.php

Indentation +88 added lines, -88 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -26,7 +26,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -56,9 +56,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+    $state = wpinv_get_option( 'default_state', '' );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -288,11 +288,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
     
@@ -584,30 +584,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
@@ -625,46 +625,46 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+        return apply_filters( 'wpinv_localisation_address_formats',
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -681,21 +681,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
     
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      * 
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -716,8 +716,8 @@ 
         'country'           => '',
         'zip'               => '',
         'first_name'        => '',
-		'last_name'         => '',
-		'company'           => '',
+        'last_name'         => '',
+        'company'           => '',
     );
 
     $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
@@ -738,14 +738,14 @@ 
     $args['country_code']= $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     *
+     * @since 1.0.13
+     *
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -768,5 +768,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }
\ No newline at end of file

includes/admin/admin-pages.php

Indentation +6 added lines, -6 removed lines

@@ -63,8 +63,8 @@ 
                         'getpaid-nonce'
                     )
                 );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+        $anchor = __( 'Deactivate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     } else if( in_array( strtolower( $discount->post_status ),  array( 'pending', 'draft' ) ) ) {
@@ -81,8 +81,8 @@ 
                 'getpaid-nonce'
             )
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+        $anchor = __( 'Activate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
@@ -99,8 +99,8 @@ 
             'getpaid-nonce'
         )
     );
-	$anchor = __( 'Delete', 'invoicing' );
-	$title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
+    $anchor = __( 'Delete', 'invoicing' );
+    $title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
     $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );

includes/admin/wpinv-admin-functions.php

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 }
 
 function wpinv_admin_messages() {
-	settings_errors( 'wpinv-notices' );
+    settings_errors( 'wpinv-notices' );
 }
 add_action( 'admin_notices', 'wpinv_admin_messages' );
 

includes/class-getpaid-daily-maintenance.php

Indentation +103 added lines, -103 removed lines

@@ -12,108 +12,108 @@
  */
 class GetPaid_Daily_Maintenance {
 
-	/**
-	 * Class constructor.
-	 */
-	public function __construct(){
-
-		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
-
-		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
-
-		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
-
-	}
-
-	/**
-	 * Schedules a cron to run every day at 7 a.m
-	 *
-	 */
-	public function maybe_create_scheduled_event() {
-
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
-		}
-
-	}
-
-	/**
-	 * Clears deprecated events.
-	 *
-	 */
-	public function maybe_clear_deprecated_events() {
-
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
-		}
-
-	}
-
-	/**
-	 * Fires the old hook for backwards compatibility.
-	 *
-	 */
-	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
-	}
-
-	/**
-	 * Expires expired subscriptions.
-	 *
-	 */
-	public function maybe_expire_subscriptions() {
-
-		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
-			'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active failing cancelled',
-			'date_expires_query' => array(
-				'before'    => 'today',
-				'inclusive' => false,
-			),
-		);
-
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
-
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', true, $subscription ) ) {
-				$subscription->set_status( 'expired' );
-				$subscription->save();
-			}
-		}
-
-	}
-
-	/**
-	 * Logs cron runs.
-	 *
-	 */
-	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron' );
-	}
-
-	/**
-	 * Updates GeoIP databases.
-	 *
-	 */
-	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
-
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
-		}
-
-	}
+    /**
+     * Class constructor.
+     */
+    public function __construct(){
+
+        // Clear deprecated events.
+        add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+
+        // (Maybe) schedule a cron that runs daily.
+        add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+
+        // Fired everyday at 7 a.m (this might vary for sites with few visitors)
+        add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+
+    }
+
+    /**
+     * Schedules a cron to run every day at 7 a.m
+     *
+     */
+    public function maybe_create_scheduled_event() {
+
+        if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
+            $timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
+            wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+        }
+
+    }
+
+    /**
+     * Clears deprecated events.
+     *
+     */
+    public function maybe_clear_deprecated_events() {
+
+        if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
+            update_option( 'wpinv_cleared_old_events', 1 );
+        }
+
+    }
+
+    /**
+     * Fires the old hook for backwards compatibility.
+     *
+     */
+    public function backwards_compat() {
+        do_action( 'wpinv_register_schedule_event_daily' );
+    }
+
+    /**
+     * Expires expired subscriptions.
+     *
+     */
+    public function maybe_expire_subscriptions() {
+
+        // Fetch expired subscriptions (skips those that expire today).
+        $args  = array(
+            'number'             => -1,
+            'count_total'        => false,
+            'status'             => 'trialling active failing cancelled',
+            'date_expires_query' => array(
+                'before'    => 'today',
+                'inclusive' => false,
+            ),
+        );
+
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
+
+        foreach ( $subscriptions->get_results() as $subscription ) {
+            if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', true, $subscription ) ) {
+                $subscription->set_status( 'expired' );
+                $subscription->save();
+            }
+        }
+
+    }
+
+    /**
+     * Logs cron runs.
+     *
+     */
+    public function log_cron_run() {
+        wpinv_error_log( 'GetPaid Daily Cron' );
+    }
+
+    /**
+     * Updates GeoIP databases.
+     *
+     */
+    public function maybe_update_geoip_databases() {
+        $updated = get_transient( 'getpaid_updated_geoip_databases' );
+
+        if ( false === $updated ) {
+            set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
+            do_action( 'getpaid_update_geoip_databases' );
+        }
+
+    }
 
 }

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-shipping-address.php

Indentation +34 added lines, -34 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,22 +15,22 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Shipping_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
 
-		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+        // Retrieve shipping address.
+        $shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
 
-		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
-			return;
-		}
+        // Abort if it is invalid.
+        if ( ! is_array( $shipping_address ) ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="bsui">
 
@@ -55,31 +55,31 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Prepares a value.
-	 *
-	 * @param array $address
-	 * @param string $key
-	 * @return string
-	 */
-	public static function prepare_for_display( $address, $key ) {
+    /**
+     * Prepares a value.
+     *
+     * @param array $address
+     * @param string $key
+     * @return string
+     */
+    public static function prepare_for_display( $address, $key ) {
 
-		// Prepare the value.
-		$value = $address[ $key ];
+        // Prepare the value.
+        $value = $address[ $key ];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
-		}
+        if ( $key == 'country' ) {
+            $value = wpinv_country_name( $value );
+        }
 
-		if ( $key == 'state' ) {
-			$country = isset( $address[ 'country' ] ) ? $address[ 'country' ] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
-		}
+        if ( $key == 'state' ) {
+            $country = isset( $address[ 'country' ] ) ? $address[ 'country' ] : wpinv_get_default_country();
+            $value = wpinv_state_name( $value, $country );
+        }
 
-		return sanitize_text_field( $value );
+        return sanitize_text_field( $value );
 
-	}
+    }
 
 }

includes/class-getpaid-notification-email-sender.php

Indentation +134 added lines, -134 removed lines

@@ -13,17 +13,17 @@ 
 class GetPaid_Notification_Email_Sender {
 
     /**
-	 * Whether or not we should inline CSS into the email.
-	 */
-	public $inline_css = true;
+     * Whether or not we should inline CSS into the email.
+     */
+    public $inline_css = true;
 
     /**
-	 * The wp_mail() data.
-	 */
+     * The wp_mail() data.
+     */
     public $wp_mail_data = null;
 
     /**
-	 * Sends a new email.
+     * Sends a new email.
      * 
      * @param string|array $to The recipients email or an array of recipient emails.
      * @param string $subject The email's subject.
@@ -31,49 +31,49 @@ 
      * @param array $attachments The email attachments.
      * 
      * @return bool
-	 */
-	public function send( $to, $subject, $email, $attachments = array() ) {
+     */
+    public function send( $to, $subject, $email, $attachments = array() ) {
 
-		/*
+        /*
 		 * Allow to filter data on per-email basis.
 		 */
-		$data = apply_filters(
-			'getpaid_email_data',
-			array(
-				'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
-				'subject'     => htmlspecialchars_decode( strip_tags( $subject ), ENT_QUOTES ),
-				'email'       => apply_filters( 'wpinv_mail_content', $email ),
-				'headers'     => $this->get_headers(),
-				'attachments' => $attachments,
-			),
-			$this
-		);
+        $data = apply_filters(
+            'getpaid_email_data',
+            array(
+                'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
+                'subject'     => htmlspecialchars_decode( strip_tags( $subject ), ENT_QUOTES ),
+                'email'       => apply_filters( 'wpinv_mail_content', $email ),
+                'headers'     => $this->get_headers(),
+                'attachments' => $attachments,
+            ),
+            $this
+        );
 
         // Remove slashes.
         $data               = (array) wp_unslash( $data );
 
         // Cache it.
-		$this->wp_mail_data = $data;
+        $this->wp_mail_data = $data;
 
-		// Attach our own hooks.
-		$this->before_sending();
+        // Attach our own hooks.
+        $this->before_sending();
 
         $result = false;
 
         foreach ( $this->wp_mail_data['to'] as $to ) {
-			$result = $this->_send( $to, $data );
+            $result = $this->_send( $to, $data );
         }
 
-		// Remove our hooks.
-		$this->after_sending();		
+        // Remove our hooks.
+        $this->after_sending();		
 
-		$this->wp_mail_data = null;
+        $this->wp_mail_data = null;
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Does the actual sending.
+    /**
+     * Does the actual sending.
      * 
      * @param string $to The recipient's email.
      * @param array $data The email's data.
@@ -81,81 +81,81 @@ 
      * @param array $attachments The email attachments.
      * 
      * @return bool
-	 */
-	protected function _send( $to, $data ) {
-
-		// Prepare the sending function.
-		$sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
-
-		// Send the actual email.
-		$result = call_user_func(
-			$sending_function,
-			$to,
-			html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
-			$data['email'],
-			$data['headers'],
-			$data['attachments']
-		);
-
-		if ( ! $result ) {
-			$log_message = wp_sprintf( __( "\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
-			wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
-		}
-
-		return $result;
-	}
+     */
+    protected function _send( $to, $data ) {
+
+        // Prepare the sending function.
+        $sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
+
+        // Send the actual email.
+        $result = call_user_func(
+            $sending_function,
+            $to,
+            html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
+            $data['email'],
+            $data['headers'],
+            $data['attachments']
+        );
+
+        if ( ! $result ) {
+            $log_message = wp_sprintf( __( "\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
+            wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
+        }
+
+        return $result;
+    }
     
     /**
-	 * Retrieves email headers.
-	 */
-	public function get_headers() {
+     * Retrieves email headers.
+     */
+    public function get_headers() {
 
-		$name       = $this->get_from_name();
-		$reply_to   = $this->get_reply_to();
-		$headers    = array( "Reply-To:$name <$reply_to>" );
+        $name       = $this->get_from_name();
+        $reply_to   = $this->get_reply_to();
+        $headers    = array( "Reply-To:$name <$reply_to>" );
 
-		return apply_filters( 'getpaid_email_headers',  $headers, $this );
+        return apply_filters( 'getpaid_email_headers',  $headers, $this );
 
-	}
+    }
 
     /**
-	 * Fires before an email is sent
-	 *
-	 * @since 1.0.0
-	 */
-	public function before_sending() {
+     * Fires before an email is sent
+     *
+     * @since 1.0.0
+     */
+    public function before_sending() {
 
         do_action( 'getpaid_before_send_email', $this );
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
+        add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
+        add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
+        add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
 
-	}
+    }
 
     /**
-	 * Returns the from name.
-	 */
-	public function get_from_name() {
+     * Returns the from name.
+     */
+    public function get_from_name() {
 
         $from_name = wpinv_get_option( 'email_from_name', get_bloginfo( 'name' ) );
 
-		if ( empty( $from_name ) ) {
-			$from_name =  get_bloginfo( 'name' );
+        if ( empty( $from_name ) ) {
+            $from_name =  get_bloginfo( 'name' );
         }
 
-		return wp_specialchars_decode( $from_name, ENT_QUOTES );
+        return wp_specialchars_decode( $from_name, ENT_QUOTES );
     }
 
     /**
-	 * Returns the from email.
-	 */
-	public function get_from_address() {
+     * Returns the from email.
+     */
+    public function get_from_address() {
 
         $from_address = wpinv_get_option( 'email_from', $this->default_from_address() );
 
-		if ( ! is_email( $from_address ) ) {
-			$from_address =  $this->default_from_address();
+        if ( ! is_email( $from_address ) ) {
+            $from_address =  $this->default_from_address();
         }
         
         return $from_address;
@@ -163,75 +163,75 @@ 
     }
 
     /**
-	 * The default emails from address.
-	 * 
-	 * Defaults to wordpress@$sitename
-	 * Some hosts will block outgoing mail from this address if it doesn't exist,
-	 * but there's no easy alternative. Defaulting to admin_email might appear to be
-	 * another option, but some hosts may refuse to relay mail from an unknown domain.
-	 *
-	 */
-	public function default_from_address() {
-
-		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
-		}
-
-		$from_email = 'wordpress@' . $sitename;
-
-		return apply_filters( 'getpaid_default_from_address', $from_email );
+     * The default emails from address.
+     * 
+     * Defaults to wordpress@$sitename
+     * Some hosts will block outgoing mail from this address if it doesn't exist,
+     * but there's no easy alternative. Defaulting to admin_email might appear to be
+     * another option, but some hosts may refuse to relay mail from an unknown domain.
+     *
+     */
+    public function default_from_address() {
+
+        // Get the site domain and get rid of www.
+        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+            $sitename = substr( $sitename, 4 );
+        }
+
+        $from_email = 'wordpress@' . $sitename;
+
+        return apply_filters( 'getpaid_default_from_address', $from_email );
 
     }
     
     /**
-	 * Get the email reply-to.
-	 *
-	 *
-	 * @return string The email reply-to address.
-	 */
-	public function get_reply_to() {
+     * Get the email reply-to.
+     *
+     *
+     * @return string The email reply-to address.
+     */
+    public function get_reply_to() {
 
-		$reply_to = wpinv_get_admin_email();
+        $reply_to = wpinv_get_admin_email();
 
-		if ( ! is_email( $reply_to ) ) {
-			$reply_to =  get_option( 'admin_email' );
-		}
+        if ( ! is_email( $reply_to ) ) {
+            $reply_to =  get_option( 'admin_email' );
+        }
 
-		return $reply_to;
+        return $reply_to;
     }
     
     /**
-	 * Get the email content type.
-	 *
-	 */
-	public function get_content_type() {
-		return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
+     * Get the email content type.
+     *
+     */
+    public function get_content_type() {
+        return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
     }
     
     /**
-	 * Ensures that our email messages are not messed up by template plugins.
-	 *
-	 * @return array wp_mail_data.
-	 */
-	public function ensure_email_content( $args ) {
-		$args['message'] = $this->wp_mail_data['email'];
-		return $args;
+     * Ensures that our email messages are not messed up by template plugins.
+     *
+     * @return array wp_mail_data.
+     */
+    public function ensure_email_content( $args ) {
+        $args['message'] = $this->wp_mail_data['email'];
+        return $args;
     }
     
     /**
-	 * A little house keeping after an email is sent.
-	 *
- 	 */
-	public function after_sending() {
+     * A little house keeping after an email is sent.
+     *
+     */
+    public function after_sending() {
 
         do_action( 'getpaid_after_send_email', $this->wp_mail_data );
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000000 );
+        remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
+        remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
+        remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
+        remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000000 );
 
-	}
+    }
 
 }

includes/reports/class-getpaid-reports-abstract-report.php

Indentation +179 added lines, -179 removed lines

@@ -12,72 +12,72 @@ 
  */
 abstract class GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var array
-	 */
-	public $stats;
-
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		$this->prepare_stats();
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	public function get_range() {
-		$valid_ranges = $this->get_periods();
-
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	public function get_periods() {
-
-		$periods = array(
+    /**
+     * @var array
+     */
+    public $stats;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        $this->prepare_stats();
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    public function get_range() {
+        $valid_ranges = $this->get_periods();
+
+        if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
+            return sanitize_key( $_GET['date_range'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    public function get_periods() {
+
+        $periods = array(
             'today'     => __( 'Today', 'invoicing' ),
             'yesterday' => __( 'Yesterday', 'invoicing' ),
             '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Retrieves the current range's sql.
-	 *
-	 */
-	public function get_range_sql( $range ) {
-
-		$date     = 'CAST(meta.completed_date AS DATE)';
+            '30_days'   => __( 'Last 30 days', 'invoicing' ),
+            '60_days'   => __( 'Last 60 days', 'invoicing' ),
+            '90_days'   => __( 'Last 90 days', 'invoicing' ),
+            '180_days'  => __( 'Last 180 days', 'invoicing' ),
+            '360_days'  => __( 'Last 360 days', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Retrieves the current range's sql.
+     *
+     */
+    public function get_range_sql( $range ) {
+
+        $date     = 'CAST(meta.completed_date AS DATE)';
         $datetime = 'meta.completed_date';
 
         // Prepare durations.
         $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
+        $seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
+        $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
+        $ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
+        $sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
+        $one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
+        $three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
 
         $ranges = array(
 
@@ -94,130 +94,130 @@ 
             '7_days'       => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$seven_days_ago' AND '$today'"
-			),
+            ),
 
-			'30_days'       => array(
+            '30_days'       => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$thirty_days_ago' AND '$today'"
-			),
+            ),
 
-			'60_days'       => array(
+            '60_days'       => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$sixty_days_ago' AND '$today'"
-			),
+            ),
 
-			'90_days'       => array(
+            '90_days'       => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$ninety_days_ago' AND '$today'"
-			),
+            ),
 
-			'180_days'       => array(
+            '180_days'       => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$one_eighty_days_ago' AND '$today'"
-			),
+            ),
 
-			'360_days'       => array(
+            '360_days'       => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$three_sixty_days_ago' AND '$today'"
             ),
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Retrieves the hours in a day
-	 *
-	 */
-	public function get_hours_in_a_day() {
-
-		return array(
-			'12AM' => __( '12 AM', 'invoicing'),
-			'1AM'  => __( '1 AM', 'invoicing'),
-			'2AM'  => __( '2 AM', 'invoicing'),
-			'3AM'  => __( '3 AM', 'invoicing'),
-			'4AM'  => __( '4 AM', 'invoicing'),
-			'5AM'  => __( '5 AM', 'invoicing'),
-			'6AM'  => __( '6 AM', 'invoicing'),
-			'7AM'  => __( '7 AM', 'invoicing'),
-			'8AM'  => __( '8 AM', 'invoicing'),
-			'9AM'  => __( '9 AM', 'invoicing'),
-			'10AM' => __( '10 AM', 'invoicing'),
-			'11AM' => __( '11 AM', 'invoicing'),
-			'12pm' => __( '12 PM', 'invoicing'),
-			'1PM'  => __( '1 PM', 'invoicing'),
-			'2PM'  => __( '2 PM', 'invoicing'),
-			'3PM'  => __( '3 PM', 'invoicing'),
-			'4PM'  => __( '4 PM', 'invoicing'),
-			'5PM'  => __( '5 PM', 'invoicing'),
-			'6PM'  => __( '6 PM', 'invoicing'),
-			'7PM'  => __( '7 PM', 'invoicing'),
-			'8PM'  => __( '8 PM', 'invoicing'),
-			'9PM'  => __( '9 PM', 'invoicing'),
-			'10PM' => __( '10 PM', 'invoicing'),
-			'11PM' => __( '11 PM', 'invoicing'),
-		);
-
-	}
-
-	/**
-	 * Retrieves the days in a period
-	 *
-	 */
-	public function get_days_in_period( $days ) {
-
-		$return = array();
-		$format = 'Y-m-d';
-
-		if ( $days < 8 ) {
-			$format = 'D';
-		}
-
-		if ( $days < 32 ) {
-			$format = 'M j';
-		}
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Retrieves the weeks in a period
-	 *
-	 */
-	public function get_weeks_in_period( $days ) {
-
-		$return = array();
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-		?>
+        $sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges[ '7_days' ];
+        return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+
+    }
+
+    /**
+     * Retrieves the hours in a day
+     *
+     */
+    public function get_hours_in_a_day() {
+
+        return array(
+            '12AM' => __( '12 AM', 'invoicing'),
+            '1AM'  => __( '1 AM', 'invoicing'),
+            '2AM'  => __( '2 AM', 'invoicing'),
+            '3AM'  => __( '3 AM', 'invoicing'),
+            '4AM'  => __( '4 AM', 'invoicing'),
+            '5AM'  => __( '5 AM', 'invoicing'),
+            '6AM'  => __( '6 AM', 'invoicing'),
+            '7AM'  => __( '7 AM', 'invoicing'),
+            '8AM'  => __( '8 AM', 'invoicing'),
+            '9AM'  => __( '9 AM', 'invoicing'),
+            '10AM' => __( '10 AM', 'invoicing'),
+            '11AM' => __( '11 AM', 'invoicing'),
+            '12pm' => __( '12 PM', 'invoicing'),
+            '1PM'  => __( '1 PM', 'invoicing'),
+            '2PM'  => __( '2 PM', 'invoicing'),
+            '3PM'  => __( '3 PM', 'invoicing'),
+            '4PM'  => __( '4 PM', 'invoicing'),
+            '5PM'  => __( '5 PM', 'invoicing'),
+            '6PM'  => __( '6 PM', 'invoicing'),
+            '7PM'  => __( '7 PM', 'invoicing'),
+            '8PM'  => __( '8 PM', 'invoicing'),
+            '9PM'  => __( '9 PM', 'invoicing'),
+            '10PM' => __( '10 PM', 'invoicing'),
+            '11PM' => __( '11 PM', 'invoicing'),
+        );
+
+    }
+
+    /**
+     * Retrieves the days in a period
+     *
+     */
+    public function get_days_in_period( $days ) {
+
+        $return = array();
+        $format = 'Y-m-d';
+
+        if ( $days < 8 ) {
+            $format = 'D';
+        }
+
+        if ( $days < 32 ) {
+            $format = 'M j';
+        }
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Retrieves the weeks in a period
+     *
+     */
+    public function get_weeks_in_period( $days ) {
+
+        $return = array();
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+        ?>
 
 			<div class="row">
 				<div class="col-12">
@@ -231,20 +231,20 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function prepare_stats();
-
-	/**
-	 * Displays the actual report.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function display_stats();
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function prepare_stats();
+
+    /**
+     * Displays the actual report.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function display_stats();
 
 }