AyeCode / invoicing

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/class-wpinv-discount.php

Indentation +1261 added lines, -1261 removed lines

@@ -15,30 +15,30 @@ 
  */
 class WPInv_Discount extends GetPaid_Data  {
 
-	/**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+    /**
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'discount';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'discount';
-
-	/**
-	 * Discount Data array. This is the core item data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'status'               => 'draft',
-		'version'              => '',
-		'date_created'         => null,
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'discount';
+
+    /**
+     * Discount Data array. This is the core item data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'status'               => 'draft',
+        'version'              => '',
+        'date_created'         => null,
         'date_modified'        => null,
         'name'                 => 'no-name',
         'description'          => '',
@@ -58,144 +58,144 @@ 
         'amount'               => null,
     );
 
-	/**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_discounts';
+    /**
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_discounts';
 
     /**
      * Stores a reference to the original WP_Post object
      *
      * @var WP_Post
      */
-	protected $post = null;
-
-	/**
-	 * Get the discount if ID is passed, otherwise the discount is new and empty.
-	 *
-	 * @param int|array|string|WPInv_Discount|WP_Post $discount discount data, object, ID or code.
-	 */
-	public function __construct( $discount = 0 ) {
-		parent::__construct( $discount );
-
-		if ( is_numeric( $discount ) && 'wpi_discount' === get_post_type( $discount ) ) {
-			$this->set_id( $discount );
-		} elseif ( $discount instanceof self ) {
-			$this->set_id( $discount->get_id() );
-		} elseif ( ! empty( $discount->ID ) ) {
-			$this->set_id( $discount->ID );
-		} elseif ( is_array( $discount ) ) {
-			$this->set_props( $discount );
-
-			if ( isset( $discount['ID'] ) ) {
-				$this->set_id( $discount['ID'] );
-			}
-
-		} elseif ( is_scalar( $discount ) && $discount = self::get_discount_id_by_code( $discount ) ) {
-			$this->set_id( $discount );
-		} else {
-			$this->set_object_read( true );
-		}
+    protected $post = null;
+
+    /**
+     * Get the discount if ID is passed, otherwise the discount is new and empty.
+     *
+     * @param int|array|string|WPInv_Discount|WP_Post $discount discount data, object, ID or code.
+     */
+    public function __construct( $discount = 0 ) {
+        parent::__construct( $discount );
+
+        if ( is_numeric( $discount ) && 'wpi_discount' === get_post_type( $discount ) ) {
+            $this->set_id( $discount );
+        } elseif ( $discount instanceof self ) {
+            $this->set_id( $discount->get_id() );
+        } elseif ( ! empty( $discount->ID ) ) {
+            $this->set_id( $discount->ID );
+        } elseif ( is_array( $discount ) ) {
+            $this->set_props( $discount );
+
+            if ( isset( $discount['ID'] ) ) {
+                $this->set_id( $discount['ID'] );
+            }
+
+        } elseif ( is_scalar( $discount ) && $discount = self::get_discount_id_by_code( $discount ) ) {
+            $this->set_id( $discount );
+        } else {
+            $this->set_object_read( true );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
+        if ( $this->get_id() > 0 ) {
             $this->post = get_post( $this->get_id() );
             $this->ID   = $this->get_id();
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
+        }
+
+    }
+
+    /**
+     * Fetch a discount from the db/cache
+     *
+     *
+     * @static
+     * @param string $field The field to query against: 'ID', 'discount_code'
+     * @param string|int $value The field value
+     * @deprecated
+     * @since 1.0.15
+     * @return array|bool array of discount details on success. False otherwise.
+     */
+    public static function get_data_by( $field, $value ) {
+
+        if ( 'id' == strtolower( $field ) ) {
+            // Make sure the value is numeric to avoid casting objects, for example,
+            // to int 1.
+            if ( ! is_numeric( $value ) )
+                return false;
+            $value = intval( $value );
+            if ( $value < 1 )
+                return false;
+        }
+
+        if ( ! $value || ! is_string( $field ) ) {
+            return false;
+        }
+
+        $field = trim( $field );
+
+        // prepare query args
+        switch ( strtolower( $field ) ) {
+            case 'id':
+                $discount_id = $value;
+                $args		 = array( 'include' => array( $value ) );
+                break;
+            case 'discount_code':
+            case 'code':
+                $value       = trim( $value );
+                $discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
+                $args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
+                break;
+            case 'name':
+                $discount_id = 0;
+                $args		 = array( 'name' => trim( $value ) );
+                break;
+            default:
+                $args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
+                if ( ! is_array( $args ) ) {
+                    return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
+                }
+
+        }
+
+        // Check if there is a cached value.
+        if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
+            return $discount;
+        }
+
+        $args = array_merge(
+            $args,
+            array(
+                'post_type'      => 'wpi_discount',
+                'posts_per_page' => 1,
+                'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+            )
+        );
+
+        $discount = get_posts( $args );
+
+        if( empty( $discount ) ) {
+            return false;
         }
 
-	}
-
-	/**
-	 * Fetch a discount from the db/cache
-	 *
-	 *
-	 * @static
-	 * @param string $field The field to query against: 'ID', 'discount_code'
-	 * @param string|int $value The field value
-	 * @deprecated
-	 * @since 1.0.15
-	 * @return array|bool array of discount details on success. False otherwise.
-	 */
-	public static function get_data_by( $field, $value ) {
-
-		if ( 'id' == strtolower( $field ) ) {
-			// Make sure the value is numeric to avoid casting objects, for example,
-			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
-		}
-
-		if ( ! $value || ! is_string( $field ) ) {
-			return false;
-		}
-
-		$field = trim( $field );
-
-		// prepare query args
-		switch ( strtolower( $field ) ) {
-			case 'id':
-				$discount_id = $value;
-				$args		 = array( 'include' => array( $value ) );
-				break;
-			case 'discount_code':
-			case 'code':
-				$value       = trim( $value );
-				$discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
-				$args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
-				break;
-			case 'name':
-				$discount_id = 0;
-				$args		 = array( 'name' => trim( $value ) );
-				break;
-			default:
-				$args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
-				if ( ! is_array( $args ) ) {
-					return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
-				}
-
-		}
-
-		// Check if there is a cached value.
-		if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
-			return $discount;
-		}
-
-		$args = array_merge(
-			$args,
-			array(
-				'post_type'      => 'wpi_discount',
-				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
-			)
-		);
-
-		$discount = get_posts( $args );
-
-		if( empty( $discount ) ) {
-			return false;
-		}
-
-		$discount = $discount[0];
-
-		// Prepare the return data.
-		$return = array(
+        $discount = $discount[0];
+
+        // Prepare the return data.
+        $return = array(
             'ID'                          => $discount->ID,
             'code'                        => get_post_meta( $discount->ID, '_wpi_discount_code', true ),
             'amount'                      => get_post_meta( $discount->ID, '_wpi_discount_amount', true ),
             'date_created'                => $discount->post_date,
-			'date_modified'               => $discount->post_modified,
-			'status'               		  => $discount->post_status,
-			'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
+            'date_modified'               => $discount->post_modified,
+            'status'               		  => $discount->post_status,
+            'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
             'expiration'                  => get_post_meta( $discount->ID, '_wpi_discount_expiration', true ),
             'type'               		  => get_post_meta( $discount->ID, '_wpi_discount_type', true ),
             'description'                 => $discount->post_excerpt,
@@ -209,77 +209,77 @@ 
             'max_total'                   => get_post_meta( $discount->ID, '_wpi_discount_max_total', true ),
         );
 
-		$return = apply_filters( 'wpinv_discount_properties', $return );
-
-		// Update the cache with our data
-		wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
-		wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
-
-		return $return;
-	}
-
-	/**
-	 * Given a discount code, it returns a discount id.
-	 *
-	 *
-	 * @static
-	 * @param string $discount_code
-	 * @since 1.0.15
-	 * @return int
-	 */
-	public static function get_discount_id_by_code( $discount_code ) {
-
-		// Trim the code.
-		$discount_code = trim( $discount_code );
-
-		// Ensure a value has been passed.
-		if ( empty( $discount_code ) ) {
-			return 0;
-		}
-
-		// Maybe retrieve from the cache.
-		$discount_id   = wp_cache_get( $discount_code, 'getpaid_discount_codes' );
-		if ( ! empty( $discount_id ) ) {
-			return $discount_id;
-		}
-
-		// Fetch the first discount codes.
-		$discounts = get_posts(
-			array(
-				'meta_key'       => '_wpi_discount_code',
-				'meta_value'     => $discount_code,
-				'post_type'      => 'wpi_discount',
-				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' ),
-				'fields'         => 'ids',
-			)
-		);
-
-		if ( empty( $discounts ) ) {
-			return 0;
-		}
-
-		$discount_id = $discounts[0];
-
-		// Update the cache with our data
-		wp_cache_add( get_post_meta( $discount_id, '_wpi_discount_code', true ), $discount_id, 'getpaid_discount_codes' );
-
-		return $discount_id;
-	}
-
-	/**
-	 * Magic method for checking the existence of a certain custom field.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return bool Whether the given discount field is set.
-	 */
-	public function __isset( $key ){
-		return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
-	}
-
-	/*
+        $return = apply_filters( 'wpinv_discount_properties', $return );
+
+        // Update the cache with our data
+        wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
+        wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
+
+        return $return;
+    }
+
+    /**
+     * Given a discount code, it returns a discount id.
+     *
+     *
+     * @static
+     * @param string $discount_code
+     * @since 1.0.15
+     * @return int
+     */
+    public static function get_discount_id_by_code( $discount_code ) {
+
+        // Trim the code.
+        $discount_code = trim( $discount_code );
+
+        // Ensure a value has been passed.
+        if ( empty( $discount_code ) ) {
+            return 0;
+        }
+
+        // Maybe retrieve from the cache.
+        $discount_id   = wp_cache_get( $discount_code, 'getpaid_discount_codes' );
+        if ( ! empty( $discount_id ) ) {
+            return $discount_id;
+        }
+
+        // Fetch the first discount codes.
+        $discounts = get_posts(
+            array(
+                'meta_key'       => '_wpi_discount_code',
+                'meta_value'     => $discount_code,
+                'post_type'      => 'wpi_discount',
+                'posts_per_page' => 1,
+                'post_status'    => array( 'publish', 'pending', 'draft', 'expired' ),
+                'fields'         => 'ids',
+            )
+        );
+
+        if ( empty( $discounts ) ) {
+            return 0;
+        }
+
+        $discount_id = $discounts[0];
+
+        // Update the cache with our data
+        wp_cache_add( get_post_meta( $discount_id, '_wpi_discount_code', true ), $discount_id, 'getpaid_discount_codes' );
+
+        return $discount_id;
+    }
+
+    /**
+     * Magic method for checking the existence of a certain custom field.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @return bool Whether the given discount field is set.
+     */
+    public function __isset( $key ){
+        return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD methods
 	|--------------------------------------------------------------------------
@@ -294,430 +294,430 @@ 
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Get discount status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+    /**
+     * Get discount status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
     }
 
     /**
-	 * Get plugin version when the discount was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+     * Get plugin version when the discount was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_version( $context = 'view' ) {
+        return $this->get_prop( 'version', $context );
     }
 
     /**
-	 * Get date when the discount was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+     * Get date when the discount was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_prop( 'date_created', $context );
     }
 
     /**
-	 * Get GMT date when the discount was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
+     * Get GMT date when the discount was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
         $date = $this->get_date_created( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get date when the discount was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+     * Get date when the discount was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified( $context = 'view' ) {
+        return $this->get_prop( 'date_modified', $context );
     }
 
     /**
-	 * Get GMT date when the discount was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
+     * Get GMT date when the discount was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified_gmt( $context = 'view' ) {
         $date = $this->get_date_modified( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get the discount name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+     * Get the discount name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        return $this->get_prop( 'name', $context );
     }
 
     /**
-	 * Alias of self::get_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+     * Alias of self::get_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_title( $context = 'view' ) {
+        return $this->get_name( $context );
     }
 
     /**
-	 * Get the discount description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_description( $context = 'view' ) {
-		return $this->get_prop( 'description', $context );
+     * Get the discount description.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_description( $context = 'view' ) {
+        return $this->get_prop( 'description', $context );
     }
 
     /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_excerpt( $context = 'view' ) {
-		return $this->get_description( $context );
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_excerpt( $context = 'view' ) {
+        return $this->get_description( $context );
     }
 
     /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_summary( $context = 'view' ) {
-		return $this->get_description( $context );
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_summary( $context = 'view' ) {
+        return $this->get_description( $context );
     }
 
     /**
-	 * Get the owner of the discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
-	}
+     * Get the owner of the discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
+    }
 	
-	/**
-	 * Get the discount code.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_code( $context = 'view' ) {
-		return $this->get_prop( 'code', $context );
-	}
+    /**
+     * Get the discount code.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_code( $context = 'view' ) {
+        return $this->get_prop( 'code', $context );
+    }
 	
-	/**
-	 * Alias for self::get_code().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_coupon_code( $context = 'view' ) {
-		return $this->get_code( $context );
-	}
+    /**
+     * Alias for self::get_code().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_coupon_code( $context = 'view' ) {
+        return $this->get_code( $context );
+    }
 	
-	/**
-	 * Alias for self::get_code().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_discount_code( $context = 'view' ) {
-		return $this->get_code( $context );
-	}
+    /**
+     * Alias for self::get_code().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_discount_code( $context = 'view' ) {
+        return $this->get_code( $context );
+    }
 	
-	/**
-	 * Get the discount's amount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_amount( $context = 'view' ) {
-		return $this->get_prop( 'amount', $context );
-	}
-
-	/**
-	 * Get the discount's formated amount/rate.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_formatted_amount() {
-
-		if ( $this->is_type( 'flat' ) ) {
-			$rate = wpinv_price( wpinv_format_amount( $this->get_amount() ) );
-		} else {
-			$rate = $this->get_amount() . '%';
-		}
-
-		return apply_filters( 'wpinv_format_discount_rate', $rate, $this->get_type(), $this->get_amount() );
-	}
+    /**
+     * Get the discount's amount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_amount( $context = 'view' ) {
+        return $this->get_prop( 'amount', $context );
+    }
+
+    /**
+     * Get the discount's formated amount/rate.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_formatted_amount() {
+
+        if ( $this->is_type( 'flat' ) ) {
+            $rate = wpinv_price( wpinv_format_amount( $this->get_amount() ) );
+        } else {
+            $rate = $this->get_amount() . '%';
+        }
+
+        return apply_filters( 'wpinv_format_discount_rate', $rate, $this->get_type(), $this->get_amount() );
+    }
 	
-	/**
-	 * Get the discount's start date.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_start( $context = 'view' ) {
-		return $this->get_prop( 'start', $context );
-	}
+    /**
+     * Get the discount's start date.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_start( $context = 'view' ) {
+        return $this->get_prop( 'start', $context );
+    }
 	
-	/**
-	 * Alias for self::get_start().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_start_date( $context = 'view' ) {
-		return $this->get_start( $context );
-	}
+    /**
+     * Alias for self::get_start().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_start_date( $context = 'view' ) {
+        return $this->get_start( $context );
+    }
 	
-	/**
-	 * Get the discount's expiration date.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
-	}
+    /**
+     * Get the discount's expiration date.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_expiration( $context = 'view' ) {
+        return $this->get_prop( 'expiration', $context );
+    }
 	
-	/**
-	 * Alias for self::get_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_expiration_date( $context = 'view' ) {
-		return $this->get_expiration( $context );
-	}
-
-	/**
-	 * Alias for self::get_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_end_date( $context = 'view' ) {
-		return $this->get_expiration( $context );
-	}
+    /**
+     * Alias for self::get_expiration().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_expiration_date( $context = 'view' ) {
+        return $this->get_expiration( $context );
+    }
+
+    /**
+     * Alias for self::get_expiration().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_end_date( $context = 'view' ) {
+        return $this->get_expiration( $context );
+    }
 	
-	/**
-	 * Get the discount's type.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_type( $context = 'view' ) {
-		return $this->get_prop( 'type', $context );
-	}
-
-	/**
-	 * Get the number of times a discount has been used.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_uses( $context = 'view' ) {
-		return (int) $this->get_prop( 'uses', $context );
-	}
-
-	/**
-	 * Get the discount's usage, i.e uses / max uses.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_usage() {
-
-		if ( ! $this->has_limit() ) {
-			return $this->get_uses() . ' / ' . ' &infin;';
-		}
-
-		return $this->get_uses() . ' / ' . (int) $this->get_max_uses();
-
-	}
-
-	/**
-	 * Get the maximum number of time a discount can be used.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_max_uses( $context = 'view' ) {
-		$max_uses = $this->get_prop( 'max_uses', $context );
-		return empty( $max_uses ) ? null : $max_uses;
-	}
-
-	/**
-	 * Checks if this is a single use discount or not.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_is_single_use( $context = 'view' ) {
-		return $this->get_prop( 'is_single_use', $context );
-	}
-
-	/**
-	 * Get the items that can be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_items( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'items', $context ) );
-	}
-
-	/**
-	 * Alias for self::get_items().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_allowed_items( $context = 'view' ) {
-		return $this->get_items( $context );
-	}
-
-	/**
-	 * Get the items that are not allowed to use this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_excluded_items( $context = 'view' ) {
-		return wpinv_parse_list( $this->get_prop( 'excluded_items', $context ) );
-	}
-
-	/**
-	 * Checks if this is a recurring discount or not.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int|string|bool
-	 */
-	public function get_is_recurring( $context = 'view' ) {
-		return $this->get_prop( 'is_recurring', $context );
-	}
-
-	/**
-	 * Get's the minimum total amount allowed for this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_min_total( $context = 'view' ) {
-		$minimum = $this->get_prop( 'min_total', $context );
-		return empty( $minimum ) ? null : $minimum;
-	}
-
-	/**
-	 * Alias for self::get_min_total().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_minimum_total( $context = 'view' ) {
-		return $this->get_min_total( $context );
-	}
-
-	/**
-	 * Get's the maximum total amount allowed for this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_max_total( $context = 'view' ) {
-		$maximum = $this->get_prop( 'max_total', $context );
-		return empty( $maximum ) ? null : $maximum;
-	}
-
-	/**
-	 * Alias for self::get_max_total().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_maximum_total( $context = 'view' ) {
-		return $this->get_max_total( $context );
-	}
-
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @param  string $context View or edit context.
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function get( $key, $context = 'view' ) {
+    /**
+     * Get the discount's type.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_type( $context = 'view' ) {
+        return $this->get_prop( 'type', $context );
+    }
+
+    /**
+     * Get the number of times a discount has been used.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_uses( $context = 'view' ) {
+        return (int) $this->get_prop( 'uses', $context );
+    }
+
+    /**
+     * Get the discount's usage, i.e uses / max uses.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_usage() {
+
+        if ( ! $this->has_limit() ) {
+            return $this->get_uses() . ' / ' . ' &infin;';
+        }
+
+        return $this->get_uses() . ' / ' . (int) $this->get_max_uses();
+
+    }
+
+    /**
+     * Get the maximum number of time a discount can be used.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_max_uses( $context = 'view' ) {
+        $max_uses = $this->get_prop( 'max_uses', $context );
+        return empty( $max_uses ) ? null : $max_uses;
+    }
+
+    /**
+     * Checks if this is a single use discount or not.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_is_single_use( $context = 'view' ) {
+        return $this->get_prop( 'is_single_use', $context );
+    }
+
+    /**
+     * Get the items that can be used with this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_items( $context = 'view' ) {
+        return wpinv_parse_list( $this->get_prop( 'items', $context ) );
+    }
+
+    /**
+     * Alias for self::get_items().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_allowed_items( $context = 'view' ) {
+        return $this->get_items( $context );
+    }
+
+    /**
+     * Get the items that are not allowed to use this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_excluded_items( $context = 'view' ) {
+        return wpinv_parse_list( $this->get_prop( 'excluded_items', $context ) );
+    }
+
+    /**
+     * Checks if this is a recurring discount or not.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int|string|bool
+     */
+    public function get_is_recurring( $context = 'view' ) {
+        return $this->get_prop( 'is_recurring', $context );
+    }
+
+    /**
+     * Get's the minimum total amount allowed for this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_min_total( $context = 'view' ) {
+        $minimum = $this->get_prop( 'min_total', $context );
+        return empty( $minimum ) ? null : $minimum;
+    }
+
+    /**
+     * Alias for self::get_min_total().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_minimum_total( $context = 'view' ) {
+        return $this->get_min_total( $context );
+    }
+
+    /**
+     * Get's the maximum total amount allowed for this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_max_total( $context = 'view' ) {
+        $maximum = $this->get_prop( 'max_total', $context );
+        return empty( $maximum ) ? null : $maximum;
+    }
+
+    /**
+     * Alias for self::get_max_total().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_maximum_total( $context = 'view' ) {
+        return $this->get_max_total( $context );
+    }
+
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @param  string $context View or edit context.
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function get( $key, $context = 'view' ) {
         return $this->get_prop( $key, $context );
-	}
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Setters
 	|--------------------------------------------------------------------------
@@ -727,41 +727,41 @@ 
 	| object.
 	*/
 	
-	/**
-	 * Sets discount status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+    /**
+     * Sets discount status.
+     *
+     * @since 1.0.19
+     * @param  string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
         $this->set_prop( 'status', $status );
 
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
     }
 
     /**
-	 * Set plugin version when the discount was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+     * Set plugin version when the discount was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
     }
 
     /**
-	 * Set date when the discount was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the discount was created.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_created( $value ) {
+     */
+    public function set_date_created( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -774,13 +774,13 @@ 
     }
 
     /**
-	 * Set date when the discount was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the discount was last modified.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_modified( $value ) {
+     */
+    public function set_date_modified( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -793,324 +793,324 @@ 
     }
 
     /**
-	 * Set the discount name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
+     * Set the discount name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
         $name = sanitize_text_field( $value );
-		$this->set_prop( 'name', $name );
+        $this->set_prop( 'name', $name );
     }
 
     /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+     * Alias of self::set_name().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_title( $value ) {
+        $this->set_name( $value );
     }
 
     /**
-	 * Set the discount description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_description( $value ) {
+     * Set the discount description.
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_description( $value ) {
         $description = wp_kses_post( $value );
-		return $this->set_prop( 'description', $description );
+        return $this->set_prop( 'description', $description );
     }
 
     /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_excerpt( $value ) {
-		$this->set_description( $value );
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_excerpt( $value ) {
+        $this->set_description( $value );
     }
 
     /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_summary( $value ) {
-		$this->set_description( $value );
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_summary( $value ) {
+        $this->set_description( $value );
     }
 
     /**
-	 * Set the owner of the discount.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
-	}
+     * Set the owner of the discount.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $this->set_prop( 'author', (int) $value );
+    }
 	
-	/**
-	 * Sets the discount code.
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount code.
-	 */
-	public function set_code( $value ) {
-		$code = sanitize_text_field( $value );
-		$this->set_prop( 'code', $code );
-	}
+    /**
+     * Sets the discount code.
+     *
+     * @since 1.0.19
+     * @param string $value New discount code.
+     */
+    public function set_code( $value ) {
+        $code = sanitize_text_field( $value );
+        $this->set_prop( 'code', $code );
+    }
 	
-	/**
-	 * Alias of self::set_code().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount code.
-	 */
-	public function set_coupon_code( $value ) {
-		$this->set_code( $value );
-	}
+    /**
+     * Alias of self::set_code().
+     *
+     * @since 1.0.19
+     * @param string $value New discount code.
+     */
+    public function set_coupon_code( $value ) {
+        $this->set_code( $value );
+    }
 	
-	/**
-	 * Alias of self::set_code().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount code.
-	 */
-	public function set_discount_code( $value ) {
-		$this->set_code( $value );
-	}
+    /**
+     * Alias of self::set_code().
+     *
+     * @since 1.0.19
+     * @param string $value New discount code.
+     */
+    public function set_discount_code( $value ) {
+        $this->set_code( $value );
+    }
 	
-	/**
-	 * Sets the discount amount.
-	 *
-	 * @since 1.0.19
-	 * @param float $value New discount code.
-	 */
-	public function set_amount( $value ) {
-		$amount = floatval( wpinv_sanitize_amount( $value ) );
-		$this->set_prop( 'amount', $amount );
-	}
-
-	/**
-	 * Sets the discount's start date.
-	 *
-	 * @since 1.0.19
-	 * @param float $value New start date.
-	 */
-	public function set_start( $value ) {
-		$date = strtotime( $value );
+    /**
+     * Sets the discount amount.
+     *
+     * @since 1.0.19
+     * @param float $value New discount code.
+     */
+    public function set_amount( $value ) {
+        $amount = floatval( wpinv_sanitize_amount( $value ) );
+        $this->set_prop( 'amount', $amount );
+    }
 
-        if ( $date ) {
-            $this->set_prop( 'start', date( 'Y-m-d H:i', $date ) );
-            return true;
-		}
+    /**
+     * Sets the discount's start date.
+     *
+     * @since 1.0.19
+     * @param float $value New start date.
+     */
+    public function set_start( $value ) {
+        $date = strtotime( $value );
+
+        if ( $date ) {
+            $this->set_prop( 'start', date( 'Y-m-d H:i', $date ) );
+            return true;
+        }
 		
-		$this->set_prop( 'start', '' );
+        $this->set_prop( 'start', '' );
 
         return false;
-	}
-
-	/**
-	 * Alias of self::set_start().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New start date.
-	 */
-	public function set_start_date( $value ) {
-		$this->set_start( $value );
-	}
-
-	/**
-	 * Sets the discount's expiration date.
-	 *
-	 * @since 1.0.19
-	 * @param float $value New expiration date.
-	 */
-	public function set_expiration( $value ) {
-		$date = strtotime( $value );
+    }
+
+    /**
+     * Alias of self::set_start().
+     *
+     * @since 1.0.19
+     * @param string $value New start date.
+     */
+    public function set_start_date( $value ) {
+        $this->set_start( $value );
+    }
+
+    /**
+     * Sets the discount's expiration date.
+     *
+     * @since 1.0.19
+     * @param float $value New expiration date.
+     */
+    public function set_expiration( $value ) {
+        $date = strtotime( $value );
 
         if ( $date ) {
             $this->set_prop( 'expiration', date( 'Y-m-d H:i', $date ) );
             return true;
         }
 
-		$this->set_prop( 'expiration', '' );
+        $this->set_prop( 'expiration', '' );
         return false;
-	}
-
-	/**
-	 * Alias of self::set_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New expiration date.
-	 */
-	public function set_expiration_date( $value ) {
-		$this->set_expiration( $value );
-	}
-
-	/**
-	 * Alias of self::set_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New expiration date.
-	 */
-	public function set_end_date( $value ) {
-		$this->set_expiration( $value );
-	}
-
-	/**
-	 * Sets the discount type.
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount type.
-	 */
-	public function set_type( $value ) {
-		if ( $value && array_key_exists( sanitize_text_field( $value ), wpinv_get_discount_types() ) ) {
-			$this->set_prop( 'type', sanitize_text_field( $value ) );
-		}
-	}
-
-	/**
-	 * Sets the number of times a discount has been used.
-	 *
-	 * @since 1.0.19
-	 * @param int $value usage count.
-	 */
-	public function set_uses( $value ) {
-
-		$value = (int) $value;
-
-		if ( $value < 0 ) {
-			$value = 0;
-		}
-
-		$this->set_prop( 'uses', (int) $value );
-	}
-
-	/**
-	 * Sets the maximum number of times a discount can be used.
-	 *
-	 * @since 1.0.19
-	 * @param int $value maximum usage count.
-	 */
-	public function set_max_uses( $value ) {
-		$this->set_prop( 'max_uses', absint( $value ) );
-	}
-
-	/**
-	 * Sets if this is a single use discount or not.
-	 *
-	 * @since 1.0.19
-	 * @param int|bool $value is single use.
-	 */
-	public function set_is_single_use( $value ) {
-		$this->set_prop( 'is_single_use', (bool) $value );
-	}
-
-	/**
-	 * Sets the items that can be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param array $value items.
-	 */
-	public function set_items( $value ) {
-		$this->set_prop( 'items', wpinv_parse_list( $value ) );
-	}
-
-	/**
-	 * Alias for self::set_items().
-	 *
-	 * @since 1.0.19
-	 * @param array $value items.
-	 */
-	public function set_allowed_items( $value ) {
-		$this->set_items( $value );
-	}
-
-	/**
-	 * Sets the items that can not be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param array $value items.
-	 */
-	public function set_excluded_items( $value ) {
-		$this->set_prop( 'excluded_items', wpinv_parse_list( $value ) );
-	}
-
-	/**
-	 * Sets if this is a recurring discounts or not.
-	 *
-	 * @since 1.0.19
-	 * @param int|bool $value is recurring.
-	 */
-	public function set_is_recurring( $value ) {
-		$this->set_prop( 'is_recurring', (bool) $value );
-	}
-
-	/**
-	 * Sets the minimum total that can not be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param float $value minimum total.
-	 */
-	public function set_min_total( $value ) {
-		$this->set_prop( 'min_total', (float) wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Alias for self::set_min_total().
-	 *
-	 * @since 1.0.19
-	 * @param float $value minimum total.
-	 */
-	public function set_minimum_total( $value ) {
-		$this->set_min_total( $value );
-	}
-
-	/**
-	 * Sets the maximum total that can not be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param float $value maximum total.
-	 */
-	public function set_max_total( $value ) {
-		$this->set_prop( 'max_total', (float) wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Alias for self::set_max_total().
-	 *
-	 * @since 1.0.19
-	 * @param float $value maximum total.
-	 */
-	public function set_maximum_total( $value ) {
-		$this->set_max_total( $value );
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function refresh(){}
-
-	/**
-	 * @deprecated
-	 *
-	 */
-	public function update_status( $status = 'publish' ){
-
-		if ( $this->exists() && $this->get_status() != $status ) {
-			$this->set_status( $status );
-			$this->save();
-		}
-
-	}
-
-	/*
+    }
+
+    /**
+     * Alias of self::set_expiration().
+     *
+     * @since 1.0.19
+     * @param string $value New expiration date.
+     */
+    public function set_expiration_date( $value ) {
+        $this->set_expiration( $value );
+    }
+
+    /**
+     * Alias of self::set_expiration().
+     *
+     * @since 1.0.19
+     * @param string $value New expiration date.
+     */
+    public function set_end_date( $value ) {
+        $this->set_expiration( $value );
+    }
+
+    /**
+     * Sets the discount type.
+     *
+     * @since 1.0.19
+     * @param string $value New discount type.
+     */
+    public function set_type( $value ) {
+        if ( $value && array_key_exists( sanitize_text_field( $value ), wpinv_get_discount_types() ) ) {
+            $this->set_prop( 'type', sanitize_text_field( $value ) );
+        }
+    }
+
+    /**
+     * Sets the number of times a discount has been used.
+     *
+     * @since 1.0.19
+     * @param int $value usage count.
+     */
+    public function set_uses( $value ) {
+
+        $value = (int) $value;
+
+        if ( $value < 0 ) {
+            $value = 0;
+        }
+
+        $this->set_prop( 'uses', (int) $value );
+    }
+
+    /**
+     * Sets the maximum number of times a discount can be used.
+     *
+     * @since 1.0.19
+     * @param int $value maximum usage count.
+     */
+    public function set_max_uses( $value ) {
+        $this->set_prop( 'max_uses', absint( $value ) );
+    }
+
+    /**
+     * Sets if this is a single use discount or not.
+     *
+     * @since 1.0.19
+     * @param int|bool $value is single use.
+     */
+    public function set_is_single_use( $value ) {
+        $this->set_prop( 'is_single_use', (bool) $value );
+    }
+
+    /**
+     * Sets the items that can be used with this discount.
+     *
+     * @since 1.0.19
+     * @param array $value items.
+     */
+    public function set_items( $value ) {
+        $this->set_prop( 'items', wpinv_parse_list( $value ) );
+    }
+
+    /**
+     * Alias for self::set_items().
+     *
+     * @since 1.0.19
+     * @param array $value items.
+     */
+    public function set_allowed_items( $value ) {
+        $this->set_items( $value );
+    }
+
+    /**
+     * Sets the items that can not be used with this discount.
+     *
+     * @since 1.0.19
+     * @param array $value items.
+     */
+    public function set_excluded_items( $value ) {
+        $this->set_prop( 'excluded_items', wpinv_parse_list( $value ) );
+    }
+
+    /**
+     * Sets if this is a recurring discounts or not.
+     *
+     * @since 1.0.19
+     * @param int|bool $value is recurring.
+     */
+    public function set_is_recurring( $value ) {
+        $this->set_prop( 'is_recurring', (bool) $value );
+    }
+
+    /**
+     * Sets the minimum total that can not be used with this discount.
+     *
+     * @since 1.0.19
+     * @param float $value minimum total.
+     */
+    public function set_min_total( $value ) {
+        $this->set_prop( 'min_total', (float) wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Alias for self::set_min_total().
+     *
+     * @since 1.0.19
+     * @param float $value minimum total.
+     */
+    public function set_minimum_total( $value ) {
+        $this->set_min_total( $value );
+    }
+
+    /**
+     * Sets the maximum total that can not be used with this discount.
+     *
+     * @since 1.0.19
+     * @param float $value maximum total.
+     */
+    public function set_max_total( $value ) {
+        $this->set_prop( 'max_total', (float) wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Alias for self::set_max_total().
+     *
+     * @since 1.0.19
+     * @param float $value maximum total.
+     */
+    public function set_maximum_total( $value ) {
+        $this->set_max_total( $value );
+    }
+
+    /**
+     * @deprecated
+     */
+    public function refresh(){}
+
+    /**
+     * @deprecated
+     *
+     */
+    public function update_status( $status = 'publish' ){
+
+        if ( $this->exists() && $this->get_status() != $status ) {
+            $this->set_status( $status );
+            $this->save();
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Conditionals
 	|--------------------------------------------------------------------------
@@ -1119,263 +1119,263 @@ 
 	|
 	*/
 
-	/**
-	 * Checks whether a discount exists in the database or not
-	 *
-	 * @since 1.0.15
-	 */
-	public function exists(){
-		$id = $this->get_id();
-		return ! empty( $id );
-	}
-
-	/**
-	 * Checks the discount type.
-	 *
-	 *
-	 * @param  string $type the discount type to check against
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_type( $type ) {
-		return $this->get_type() == $type;
-	}
-
-	/**
-	 * Checks whether the discount is published or not
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->get_status() == 'publish';
-	}
-
-	/**
-	 * Checks whether the discount has max uses
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_limit() {
-		$limit = $this->get_max_uses();
-		return ! empty( $limit );
-	}
-
-	/**
-	 * Checks whether the discount has ever been used.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_uses() {
-		return $this->get_uses() > 0;
-	}
-
-	/**
-	 * Checks whether the discount is has exided the usage limit or not
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_exceeded_limit() {
-
-		if ( ! $this->has_limit() || ! $this->has_uses() ) {
-			$exceeded = false ;
-		} else {
-			$exceeded = ! ( (int) $this->get_max_uses() < $this->get_uses() );
-		}
-
-		return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->get_id(), $this, $this->get_code() );
-	}
-
-	/**
-	 * Checks whether the discount has an expiration date.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_expiration_date() {
-		$date = $this->get_expiration_date();
-		return ! empty( $date );
-	}
-
-	/**
-	 * Checks if the discount is expired
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_expired() {
-		$expired = $this->has_expiration_date() ? current_time( 'timestamp' ) > strtotime( $this->get_expiration_date() ) : false;
-		return apply_filters( 'wpinv_is_discount_expired', $expired, $this->get_id(), $this, $this->get_code() );
-	}
-
-	/**
-	 * Checks whether the discount has a start date.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_start_date() {
-		$date = $this->get_start_date();
-		return ! empty( $date );
-	}
-
-	/**
-	 * Checks the discount start date.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_started() {
-		$started = $this->has_start_date() ? true : current_time( 'timestamp' ) > strtotime( $this->get_start_date() );
-		return apply_filters( 'wpinv_is_discount_started', $started, $this->get_id(), $this, $this->get_code() );
-	}
-
-	/**
-	 * Checks the discount has allowed items or not.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_allowed_items() {
-		$allowed_items = $this->get_allowed_items();
-		return ! empty( $allowed_items );
-	}
-
-	/**
-	 * Checks the discount has excluded items or not.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_excluded_items() {
-		$excluded_items = $this->get_excluded_items();
-		return ! empty( $excluded_items );
-	}
-
-	/**
-	 * Check if a discount is valid for a given item id.
-	 *
-	 * @param  int|int[]  $item_ids
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_items( $item_ids ) {
-
-		$item_ids = wp_parse_id_list( $item_ids );
-		$included = array_intersect( $item_ids, $this->get_allowed_items() );
-		$excluded = array_intersect( $item_ids, $this->get_excluded_items() );
-
-		if ( $this->has_excluded_items() && ! empty( $excluded ) ) {
-			return false;
-		}
-
-		if ( $this->has_allowed_items() && empty( $included ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if a discount is valid for the given amount
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_amount( $amount ) {
-		return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
-	}
-
-	/**
-	 * Checks if the minimum amount is set
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function has_minimum_amount() {
-		$minimum = $this->get_minimum_total();
-		return ! empty( $minimum );
-	}
-
-	/**
-	 * Checks if the minimum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_minimum_amount_met( $amount ) {
-		$amount = floatval( wpinv_sanitize_amount( $amount ) );
-		$min_met= ! ( $this->has_minimum_amount() && $amount < floatval( wpinv_sanitize_amount( $this->get_minimum_total() ) ) );
-		return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->get_id(), $this, $this->get_code(), $amount );
-	}
-
-	/**
-	 * Checks if the maximum amount is set
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function has_maximum_amount() {
-		$maximum = $this->get_maximum_total();
-		return ! empty( $maximum );
-	}
-
-	/**
-	 * Checks if the maximum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_maximum_amount_met( $amount ) {
-		$amount = floatval( wpinv_sanitize_amount( $amount ) );
-		$max_met= ! ( $this->has_maximum_amount() && $amount > floatval( wpinv_sanitize_amount( $this->get_maximum_total() ) ) );
-		return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->get_id(), $this, $this->get_code(), $amount );
-	}
-
-	/**
-	 * Checks if the discount is recurring.
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_recurring() {
-		$recurring = $this->get_is_recurring();
-		return ! empty( $recurring );
-	}
-
-	/**
-	 * Checks if the discount is single use.
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_single_use() {
-		$usage = $this->get_is_single_use();
-		return ! empty( $usage );
-	}
-
-	/**
-	 * Check if a discount is valid for the given user
-	 *
-	 * @param  int|string  $user
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_user( $user ) {
-
-		// Ensure that the discount is single use.
-		if ( empty( $user ) || ! $this->is_single_use() ) {
-			return true;
-		}
-
-		// Prepare the user id.
-		$user_id = 0;
+    /**
+     * Checks whether a discount exists in the database or not
+     *
+     * @since 1.0.15
+     */
+    public function exists(){
+        $id = $this->get_id();
+        return ! empty( $id );
+    }
+
+    /**
+     * Checks the discount type.
+     *
+     *
+     * @param  string $type the discount type to check against
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_type( $type ) {
+        return $this->get_type() == $type;
+    }
+
+    /**
+     * Checks whether the discount is published or not
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_active() {
+        return $this->get_status() == 'publish';
+    }
+
+    /**
+     * Checks whether the discount has max uses
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_limit() {
+        $limit = $this->get_max_uses();
+        return ! empty( $limit );
+    }
+
+    /**
+     * Checks whether the discount has ever been used.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_uses() {
+        return $this->get_uses() > 0;
+    }
+
+    /**
+     * Checks whether the discount is has exided the usage limit or not
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_exceeded_limit() {
+
+        if ( ! $this->has_limit() || ! $this->has_uses() ) {
+            $exceeded = false ;
+        } else {
+            $exceeded = ! ( (int) $this->get_max_uses() < $this->get_uses() );
+        }
+
+        return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->get_id(), $this, $this->get_code() );
+    }
+
+    /**
+     * Checks whether the discount has an expiration date.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_expiration_date() {
+        $date = $this->get_expiration_date();
+        return ! empty( $date );
+    }
+
+    /**
+     * Checks if the discount is expired
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_expired() {
+        $expired = $this->has_expiration_date() ? current_time( 'timestamp' ) > strtotime( $this->get_expiration_date() ) : false;
+        return apply_filters( 'wpinv_is_discount_expired', $expired, $this->get_id(), $this, $this->get_code() );
+    }
+
+    /**
+     * Checks whether the discount has a start date.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_start_date() {
+        $date = $this->get_start_date();
+        return ! empty( $date );
+    }
+
+    /**
+     * Checks the discount start date.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_started() {
+        $started = $this->has_start_date() ? true : current_time( 'timestamp' ) > strtotime( $this->get_start_date() );
+        return apply_filters( 'wpinv_is_discount_started', $started, $this->get_id(), $this, $this->get_code() );
+    }
+
+    /**
+     * Checks the discount has allowed items or not.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_allowed_items() {
+        $allowed_items = $this->get_allowed_items();
+        return ! empty( $allowed_items );
+    }
+
+    /**
+     * Checks the discount has excluded items or not.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_excluded_items() {
+        $excluded_items = $this->get_excluded_items();
+        return ! empty( $excluded_items );
+    }
+
+    /**
+     * Check if a discount is valid for a given item id.
+     *
+     * @param  int|int[]  $item_ids
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_items( $item_ids ) {
+
+        $item_ids = wp_parse_id_list( $item_ids );
+        $included = array_intersect( $item_ids, $this->get_allowed_items() );
+        $excluded = array_intersect( $item_ids, $this->get_excluded_items() );
+
+        if ( $this->has_excluded_items() && ! empty( $excluded ) ) {
+            return false;
+        }
+
+        if ( $this->has_allowed_items() && empty( $included ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if a discount is valid for the given amount
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_amount( $amount ) {
+        return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
+    }
+
+    /**
+     * Checks if the minimum amount is set
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function has_minimum_amount() {
+        $minimum = $this->get_minimum_total();
+        return ! empty( $minimum );
+    }
+
+    /**
+     * Checks if the minimum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_minimum_amount_met( $amount ) {
+        $amount = floatval( wpinv_sanitize_amount( $amount ) );
+        $min_met= ! ( $this->has_minimum_amount() && $amount < floatval( wpinv_sanitize_amount( $this->get_minimum_total() ) ) );
+        return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->get_id(), $this, $this->get_code(), $amount );
+    }
+
+    /**
+     * Checks if the maximum amount is set
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function has_maximum_amount() {
+        $maximum = $this->get_maximum_total();
+        return ! empty( $maximum );
+    }
+
+    /**
+     * Checks if the maximum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_maximum_amount_met( $amount ) {
+        $amount = floatval( wpinv_sanitize_amount( $amount ) );
+        $max_met= ! ( $this->has_maximum_amount() && $amount > floatval( wpinv_sanitize_amount( $this->get_maximum_total() ) ) );
+        return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->get_id(), $this, $this->get_code(), $amount );
+    }
+
+    /**
+     * Checks if the discount is recurring.
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_recurring() {
+        $recurring = $this->get_is_recurring();
+        return ! empty( $recurring );
+    }
+
+    /**
+     * Checks if the discount is single use.
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_single_use() {
+        $usage = $this->get_is_single_use();
+        return ! empty( $usage );
+    }
+
+    /**
+     * Check if a discount is valid for the given user
+     *
+     * @param  int|string  $user
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_user( $user ) {
+
+        // Ensure that the discount is single use.
+        if ( empty( $user ) || ! $this->is_single_use() ) {
+            return true;
+        }
+
+        // Prepare the user id.
+        $user_id = 0;
         if ( is_numeric( $user ) ) {
             $user_id = absint( $user );
         } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
@@ -1384,117 +1384,117 @@ 
             $user_id = $user_data->ID;
         }
 
-		// Ensure that we have a user.
-		if ( empty( $user_id ) ) {
-			return true;
-		}
+        // Ensure that we have a user.
+        if ( empty( $user_id ) ) {
+            return true;
+        }
 
-		// Get all payments with matching user id.
+        // Get all payments with matching user id.
         $payments = wpinv_get_invoices( array( 'user' => $user_id, 'limit' => false, 'paginate' => false ) );
-		$code     = strtolower( $this->get_code() );
-
-		// For each payment...
-		foreach ( $payments as $payment ) {
-
-			// Only check for paid invoices.
-			if ( $payment->is_paid() && strtolower( $payment->get_discount_code() ) == $code ) {
-				return false;
-			}
-
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes the discount from the database
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function remove() {
-		return $this->delete();
-	}
-
-	/**
-	 * Increases a discount's usage.
-	 *
-	 * @since 1.0.15
-	 * @param int $by The number of usages to increas by.
-	 * @return int
-	 */
-	public function increase_usage( $by = 1 ) {
-
-		// Abort if zero.
-		if ( empty( $by ) ) {
-			return;
-		}
-
-		// Increase the usage.
-		$this->set_uses( $this->get_uses() + (int) $by );
-
-		// Save the discount.
-		$this->save();
-
-		// Fire relevant hooks.
-		if( (int) $by > 0 ) {
-			do_action( 'wpinv_discount_increase_use_count', $this->get_uses(), $this->get_id(), $this->get_code(),  absint( $by ) );
-		} else {
-			do_action( 'wpinv_discount_decrease_use_count', $this->get_uses(), $this->get_id(), $this->get_code(), absint( $by ) );
-		}
-
-		// Return the number of times the discount has been used.
-		return $this->get_uses();
-	}
-
-	/**
-	 * Alias of self::__toString()
-	 *
-	 * @since 1.0.15
-	 * @return string|false
-	 */
-	public function get_data_as_json() {
-		return $this->__toString();
-	}
-
-	/**
-	 * Returns a discount's discounted amount.
-	 *
-	 * @since 1.0.15
-	 * @param float $amount
-	 * @return float
-	 */
-	public function get_discounted_amount( $amount ) {
-
-		// Convert amount to float.
-		$amount = (float) $amount;
-
-		// Get discount amount.
-		$discount_amount = $this->get_amount();
-
-		if ( empty( $discount_amount ) ) {
-			return 0;
-		}
-
-		// Format the amount.
-		$discount_amount = floatval( wpinv_sanitize_amount( $discount_amount ) );
+        $code     = strtolower( $this->get_code() );
+
+        // For each payment...
+        foreach ( $payments as $payment ) {
+
+            // Only check for paid invoices.
+            if ( $payment->is_paid() && strtolower( $payment->get_discount_code() ) == $code ) {
+                return false;
+            }
+
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes the discount from the database
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function remove() {
+        return $this->delete();
+    }
+
+    /**
+     * Increases a discount's usage.
+     *
+     * @since 1.0.15
+     * @param int $by The number of usages to increas by.
+     * @return int
+     */
+    public function increase_usage( $by = 1 ) {
+
+        // Abort if zero.
+        if ( empty( $by ) ) {
+            return;
+        }
+
+        // Increase the usage.
+        $this->set_uses( $this->get_uses() + (int) $by );
+
+        // Save the discount.
+        $this->save();
+
+        // Fire relevant hooks.
+        if( (int) $by > 0 ) {
+            do_action( 'wpinv_discount_increase_use_count', $this->get_uses(), $this->get_id(), $this->get_code(),  absint( $by ) );
+        } else {
+            do_action( 'wpinv_discount_decrease_use_count', $this->get_uses(), $this->get_id(), $this->get_code(), absint( $by ) );
+        }
+
+        // Return the number of times the discount has been used.
+        return $this->get_uses();
+    }
+
+    /**
+     * Alias of self::__toString()
+     *
+     * @since 1.0.15
+     * @return string|false
+     */
+    public function get_data_as_json() {
+        return $this->__toString();
+    }
+
+    /**
+     * Returns a discount's discounted amount.
+     *
+     * @since 1.0.15
+     * @param float $amount
+     * @return float
+     */
+    public function get_discounted_amount( $amount ) {
+
+        // Convert amount to float.
+        $amount = (float) $amount;
+
+        // Get discount amount.
+        $discount_amount = $this->get_amount();
+
+        if ( empty( $discount_amount ) ) {
+            return 0;
+        }
+
+        // Format the amount.
+        $discount_amount = floatval( wpinv_sanitize_amount( $discount_amount ) );
 		
-		// If this is a percentage discount.
-		if ( $this->is_type( 'percent' ) ) {
+        // If this is a percentage discount.
+        if ( $this->is_type( 'percent' ) ) {
             $discount_amount = $amount * ( $discount_amount / 100 );
-		}
+        }
 
-		// Discount can not be less than zero...
-		if ( $discount_amount < 0 ) {
-			$discount_amount = 0;
-		}
+        // Discount can not be less than zero...
+        if ( $discount_amount < 0 ) {
+            $discount_amount = 0;
+        }
 
-		// ... or more than the amount.
-		if ( $discount_amount > $amount ) {
-			$discount_amount = $amount;
-		}
+        // ... or more than the amount.
+        if ( $discount_amount > $amount ) {
+            $discount_amount = $amount;
+        }
 
-		return apply_filters( 'wpinv_discount_total_discount_amount', $discount_amount, $amount, $this );
-	}
+        return apply_filters( 'wpinv_discount_total_discount_amount', $discount_amount, $amount, $this );
+    }
 
 }

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/class-getpaid-post-types.php

Indentation +297 added lines, -297 removed lines

@@ -15,322 +15,322 @@
 class GetPaid_Post_Types {
 
     /**
-	 * Hook in methods.
-	 */
-	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
-	}
+     * Hook in methods.
+     */
+    public function __construct() {
+        add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
+        add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
+        add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+    }
 
-	/**
-	 * Register core post types.
-	 */
-	public static function register_post_types() {
+    /**
+     * Register core post types.
+     */
+    public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
-			return;
-		}
+        if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+            return;
+        }
 
-		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+        // Fires before registering post types.
+        do_action( 'getpaid_register_post_types' );
 
-		// Register item post type.
-		register_post_type(
-			'wpi_item',
-			apply_filters(
-				'wpinv_register_post_type_invoice_item',
-				array(
-					'labels'             => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
-					),
-					'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
-					'public'                => false,
-					'has_archive'           => false,
-					'_builtin'              => false,
-					'show_ui'               => true,
-					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
-					'rewrite'               => false,
-					'query_var'             => false,
-					'capability_type'       => 'wpi_item',
-					'map_meta_cap'          => true,
-					'show_in_admin_bar'     => true,
-					'can_export'            => true,
-				)
-			)
-		);
+        // Register item post type.
+        register_post_type(
+            'wpi_item',
+            apply_filters(
+                'wpinv_register_post_type_invoice_item',
+                array(
+                    'labels'             => array(
+                        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
+                        'new_item'           => __( 'New Item', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Item', 'invoicing' ),
+                        'view_item'          => __( 'View Item', 'invoicing' ),
+                        'all_items'          => __( 'Items', 'invoicing' ),
+                        'search_items'       => __( 'Search items', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
+                        'not_found'          => __( 'No items found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' )
+                    ),
+                    'description'           => __( 'This is where you can add new invoice items.', 'invoicing' ),
+                    'public'                => false,
+                    'has_archive'           => false,
+                    '_builtin'              => false,
+                    'show_ui'               => true,
+                    'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'     => false,
+                    'supports'              => array( 'title', 'excerpt', 'thumbnail' ),
+                    'rewrite'               => false,
+                    'query_var'             => false,
+                    'capability_type'       => 'wpi_item',
+                    'map_meta_cap'          => true,
+                    'show_in_admin_bar'     => true,
+                    'can_export'            => true,
+                )
+            )
+        );
 
-		// Register payment form post type.
-		register_post_type(
-			'wpi_payment_form',
-			apply_filters(
-				'wpinv_register_post_type_payment_form',
-				array(
-					'labels'             => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
-					),
-					'description'        => __( 'Add new payment forms.', 'invoicing' ),
-					'public'             => false,
-					'show_ui'            => true,
-					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
-					'show_in_nav_menus'  => false,
-					'query_var'          => false,
-					'rewrite'            => true,
-					'map_meta_cap'       => true,
-					'has_archive'        => false,
-					'hierarchical'       => false,
-					'menu_position'      => null,
-					'supports'           => array( 'title' ),
-					'menu_icon'          => 'dashicons-media-form',
-				)
-			)
-		);
+        // Register payment form post type.
+        register_post_type(
+            'wpi_payment_form',
+            apply_filters(
+                'wpinv_register_post_type_payment_form',
+                array(
+                    'labels'             => array(
+                        'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
+                        'new_item'           => __( 'New Payment Form', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
+                        'view_item'          => __( 'View Payment Form', 'invoicing' ),
+                        'all_items'          => __( 'Payment Forms', 'invoicing' ),
+                        'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
+                        'not_found'          => __( 'No payment forms found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' )
+                    ),
+                    'description'        => __( 'Add new payment forms.', 'invoicing' ),
+                    'public'             => false,
+                    'show_ui'            => true,
+                    'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : true,
+                    'show_in_nav_menus'  => false,
+                    'query_var'          => false,
+                    'rewrite'            => true,
+                    'map_meta_cap'       => true,
+                    'has_archive'        => false,
+                    'hierarchical'       => false,
+                    'menu_position'      => null,
+                    'supports'           => array( 'title' ),
+                    'menu_icon'          => 'dashicons-media-form',
+                )
+            )
+        );
 
-		// Register invoice post type.
-		register_post_type(
-			'wpi_invoice',
-			apply_filters(
-				'wpinv_register_post_type_invoice',
-				array(
-					'labels'                 => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
-					),
-					'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
-					'public'                => true,
-					'has_archive'           => false,
-					'publicly_queryable'    => true,
-        			'exclude_from_search'   => true,
-        			'show_ui'               => true,
-					'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'show_in_nav_menus'     => false,
-					'supports'              => array( 'title', 'author', 'excerpt'  ),
-					'rewrite'               => array(
-						'slug'              => 'invoice',
-						'with_front'        => false,
-					),
-					'query_var'             => false,
-					'capability_type'       => 'wpi_invoice',
-					'map_meta_cap'          => true,
-					'show_in_admin_bar'     => true,
-					'can_export'            => true,
-					'hierarchical'          => false,
-					'menu_position'         => null,
-					'menu_icon'             => 'dashicons-media-spreadsheet',
-				)
-			)
-		);
+        // Register invoice post type.
+        register_post_type(
+            'wpi_invoice',
+            apply_filters(
+                'wpinv_register_post_type_invoice',
+                array(
+                    'labels'                 => array(
+                        'name'                  => __( 'Invoices', 'invoicing' ),
+                        'singular_name'         => __( 'Invoice', 'invoicing' ),
+                        'all_items'             => __( 'Invoices', 'invoicing' ),
+                        'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit invoice', 'invoicing' ),
+                        'new_item'              => __( 'New invoice', 'invoicing' ),
+                        'view_item'             => __( 'View invoice', 'invoicing' ),
+                        'view_items'            => __( 'View Invoices', 'invoicing' ),
+                        'search_items'          => __( 'Search invoices', 'invoicing' ),
+                        'not_found'             => __( 'No invoices found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent invoice', 'invoicing' ),
+                        'featured_image'        => __( 'Invoice image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
+                        'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
+                        'items_list'            => __( 'Invoices list', 'invoicing' ),
+                    ),
+                    'description'           => __( 'This is where invoices are stored.', 'invoicing' ),
+                    'public'                => true,
+                    'has_archive'           => false,
+                    'publicly_queryable'    => true,
+                    'exclude_from_search'   => true,
+                    'show_ui'               => true,
+                    'show_in_menu'          => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'show_in_nav_menus'     => false,
+                    'supports'              => array( 'title', 'author', 'excerpt'  ),
+                    'rewrite'               => array(
+                        'slug'              => 'invoice',
+                        'with_front'        => false,
+                    ),
+                    'query_var'             => false,
+                    'capability_type'       => 'wpi_invoice',
+                    'map_meta_cap'          => true,
+                    'show_in_admin_bar'     => true,
+                    'can_export'            => true,
+                    'hierarchical'          => false,
+                    'menu_position'         => null,
+                    'menu_icon'             => 'dashicons-media-spreadsheet',
+                )
+            )
+        );
 
-		// Register discount post type.
-		register_post_type(
-			'wpi_discount',
-			apply_filters(
-				'wpinv_register_post_type_discount',
-				array(
-					'labels'                 => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
-					),
-					'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
-					'public'             => false,
-					'can_export'         => true,
-					'_builtin'           => false,
-					'publicly_queryable' => false,
-					'exclude_from_search'=> true,
-					'show_ui'            => true,
-					'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
-					'query_var'          => false,
-					'rewrite'            => false,
-					'capability_type'    => 'wpi_discount',
-					'map_meta_cap'       => true,
-					'has_archive'        => false,
-					'hierarchical'       => false,
-					'supports'           => array( 'title', 'excerpt' ),
-					'show_in_nav_menus'  => false,
-					'show_in_admin_bar'  => true,
-					'menu_position'      => null,
-				)
-			)
-		);
+        // Register discount post type.
+        register_post_type(
+            'wpi_discount',
+            apply_filters(
+                'wpinv_register_post_type_discount',
+                array(
+                    'labels'                 => array(
+                        'name'                  => __( 'Discounts', 'invoicing' ),
+                        'singular_name'         => __( 'Discount', 'invoicing' ),
+                        'all_items'             => __( 'Discounts', 'invoicing' ),
+                        'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new discount', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit discount', 'invoicing' ),
+                        'new_item'              => __( 'New discount', 'invoicing' ),
+                        'view_item'             => __( 'View discount', 'invoicing' ),
+                        'view_items'            => __( 'View Discounts', 'invoicing' ),
+                        'search_items'          => __( 'Search discounts', 'invoicing' ),
+                        'not_found'             => __( 'No discounts found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent discount', 'invoicing' ),
+                        'featured_image'        => __( 'Discount image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
+                        'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
+                        'items_list'            => __( 'Discounts list', 'invoicing' ),
+                    ),
+                    'description'        => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+                    'public'             => false,
+                    'can_export'         => true,
+                    '_builtin'           => false,
+                    'publicly_queryable' => false,
+                    'exclude_from_search'=> true,
+                    'show_ui'            => true,
+                    'show_in_menu'       => wpinv_current_user_can_manage_invoicing() ? 'wpinv' : false,
+                    'query_var'          => false,
+                    'rewrite'            => false,
+                    'capability_type'    => 'wpi_discount',
+                    'map_meta_cap'       => true,
+                    'has_archive'        => false,
+                    'hierarchical'       => false,
+                    'supports'           => array( 'title', 'excerpt' ),
+                    'show_in_nav_menus'  => false,
+                    'show_in_admin_bar'  => true,
+                    'menu_position'      => null,
+                )
+            )
+        );
 
-		do_action( 'getpaid_after_register_post_types' );
-	}
+        do_action( 'getpaid_after_register_post_types' );
+    }
 
-	/**
-	 * Register our custom post statuses.
-	 */
-	public static function register_post_status() {
+    /**
+     * Register our custom post statuses.
+     */
+    public static function register_post_status() {
 
-		$invoice_statuses = apply_filters(
-			'getpaid_register_invoice_post_statuses',
-			array(
+        $invoice_statuses = apply_filters(
+            'getpaid_register_invoice_post_statuses',
+            array(
 
-				'wpi-pending' => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-pending' => array(
+                    'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-processing' => array(
+                    'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-onhold' => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-onhold' => array(
+                    'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-cancelled' => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-cancelled' => array(
+                    'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-refunded' => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-refunded' => array(
+                    'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-failed' => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
-				),
+                'wpi-failed' => array(
+                    'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' )
+                ),
 
-				'wpi-renewal' => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
-				)
-			)
-		);
+                'wpi-renewal' => array(
+                    'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' )
+                )
+            )
+        );
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
-		}
-	}
+        foreach ( $invoice_statuses as $invoice_statuse => $args ) {
+            register_post_status( $invoice_statuse, $args );
+        }
+    }
 
-	/**
-	 * Flush rewrite rules.
-	 */
-	public static function flush_rewrite_rules() {
-		flush_rewrite_rules();
-	}
+    /**
+     * Flush rewrite rules.
+     */
+    public static function flush_rewrite_rules() {
+        flush_rewrite_rules();
+    }
 
-	/**
-	 * Flush rules to prevent 404.
-	 *
-	 */
-	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
-			self::flush_rewrite_rules();
-		}
-	}
+    /**
+     * Flush rules to prevent 404.
+     *
+     */
+    public static function maybe_flush_rewrite_rules() {
+        if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
+            update_option( 'getpaid_flushed_rewrite_rules', '1' );
+            self::flush_rewrite_rules();
+        }
+    }
 
 }

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 );
 
-	}
+    }
 
 }

templates/payment-forms/elements/address.php

Indentation +19 added lines, -19 removed lines

@@ -10,7 +10,7 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( empty( $fields ) ) {
-	return;
+    return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -50,9 +50,9 @@ 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
-			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-		?>
+            $field_type = 'billing';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+        ?>
 	</div>
 	<!-- End Billing Address -->
 
@@ -64,19 +64,19 @@ 
 
 	<?php
 		
-		echo aui()->input(
-		    array(
-			    'type'       => 'checkbox',
-			    'name'       => 'same-shipping-address',
-			    'id'         => "shipping-toggle$uniqid",
-			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
-			    'value'      => 1,
-			    'checked'    => true,
-		    )
-		);
+        echo aui()->input(
+            array(
+                'type'       => 'checkbox',
+                'name'       => 'same-shipping-address',
+                'id'         => "shipping-toggle$uniqid",
+                'required'   => false,
+                'label'      => wp_kses_post( $shipping_address_toggle ),
+                'value'      => 1,
+                'checked'    => true,
+            )
+        );
 
-	?>
+    ?>
 
 
 	<!-- Start Shipping Address Title -->
@@ -95,9 +95,9 @@ 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
-			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-		?>
+            $field_type = 'shipping';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+        ?>
 	</div>
 	<!-- End Shipping Address -->
 

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();
 
 }