AyeCode / invoicing

includes/class-wpinv-discount.php

Indentation +668 added lines, -668 removed lines

@@ -33,173 +33,173 @@ 
  */
 class WPInv_Discount {
 	
-	/**
-	 * Discount ID.
-	 *
-	 * @since 1.0.15
-	 * @var integer|null
-	 */
-	public $ID = null;
-
-	/**
-	 * Old discount status.
-	 *
-	 * @since 1.0.15
-	 * @var string
-	 */
-	public $old_status = 'draft';
+    /**
+     * Discount ID.
+     *
+     * @since 1.0.15
+     * @var integer|null
+     */
+    public $ID = null;
+
+    /**
+     * Old discount status.
+     *
+     * @since 1.0.15
+     * @var string
+     */
+    public $old_status = 'draft';
 	
-	/**
-	 * Data array.
-	 *
-	 * @since 1.0.15
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Discount constructor.
-	 *
-	 * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
-	 * @since 1.0.15
-	 */
-	public function __construct( $discount = array() ) {
+    /**
+     * Data array.
+     *
+     * @since 1.0.15
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Discount constructor.
+     *
+     * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
+     * @since 1.0.15
+     */
+    public function __construct( $discount = array() ) {
         
         // If the discount is an instance of this class...
-		if ( $discount instanceof WPInv_Discount ) {
-			$this->init( $discount->data );
-			return;
+        if ( $discount instanceof WPInv_Discount ) {
+            $this->init( $discount->data );
+            return;
         }
         
         // If the discount is an array of discount details...
         if ( is_array( $discount ) ) {
-			$this->init( $discount );
-			return;
-		}
+            $this->init( $discount );
+            return;
+        }
 		
-		// Try fetching the discount by its post id.
-		$data = false;
+        // Try fetching the discount by its post id.
+        $data = false;
 		
-		if ( ! empty( $discount ) && is_numeric( $discount ) ) {
-			$discount = absint( $discount );
-			$data = self::get_data_by( 'id', $discount );
-		}
-
-		if ( is_array( $data ) ) {
-			$this->init( $data );
-			return;
-		}
+        if ( ! empty( $discount ) && is_numeric( $discount ) ) {
+            $discount = absint( $discount );
+            $data = self::get_data_by( 'id', $discount );
+        }
+
+        if ( is_array( $data ) ) {
+            $this->init( $data );
+            return;
+        }
 		
-		// Try fetching the discount by its discount code.
-		if ( ! empty( $discount ) && is_string( $discount ) ) {
-			$data = self::get_data_by( 'discount_code', $discount );
-		}
-
-		if ( is_array( $data ) ) {
-			$this->init( $data );
-			return;
-		} 
+        // Try fetching the discount by its discount code.
+        if ( ! empty( $discount ) && is_string( $discount ) ) {
+            $data = self::get_data_by( 'discount_code', $discount );
+        }
+
+        if ( is_array( $data ) ) {
+            $this->init( $data );
+            return;
+        } 
 		
-		// If we are here then the discount does not exist.
-		$this->init( array() );
-	}
+        // If we are here then the discount does not exist.
+        $this->init( array() );
+    }
 	
-	/**
-	 * Sets up object properties
-	 *
-	 * @since 1.0.15
-	 * @param array $data An array containing the discount's data
-	 */
-	public function init( $data ) {
-		$data       	  = self::sanitize_discount_data( $data );
-		$this->data 	  = $data;
-		$this->old_status = $data['status'];
-		$this->ID   	  = $data['ID'];
-	}
+    /**
+     * Sets up object properties
+     *
+     * @since 1.0.15
+     * @param array $data An array containing the discount's data
+     */
+    public function init( $data ) {
+        $data       	  = self::sanitize_discount_data( $data );
+        $this->data 	  = $data;
+        $this->old_status = $data['status'];
+        $this->ID   	  = $data['ID'];
+    }
 	
-	/**
-	 * 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
-	 * @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;
-		}
+    /**
+     * 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
+     * @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 );
+        $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;
-		}
+        if( empty( $discount ) ) {
+            return false;
+        }
 
-		$discount = $discount[0];
+        $discount = $discount[0];
 		
-		// Prepare the return data.
-		$return = array(
+        // 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,
@@ -213,38 +213,38 @@ 
             'max_total'                   => get_post_meta( $discount->ID, '_wpi_discount_max_total', true ),
         );
 		
-		$return = self::sanitize_discount_data( $return );
-		$return = apply_filters( 'wpinv_discount_properties', $return );
+        $return = self::sanitize_discount_data( $return );
+        $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' );
+        // 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;
-	}
+        return $return;
+    }
 	
-	/**
-	 * Sanitizes discount data
-	 *
-	 * @static
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return array the sanitized data
-	 */
-	public static function sanitize_discount_data( $data ) {
+    /**
+     * Sanitizes discount data
+     *
+     * @static
+     * @since 1.0.15
+     * @access public
+     *
+     * @return array the sanitized data
+     */
+    public static function sanitize_discount_data( $data ) {
 		
-		$allowed_discount_types = array_keys( wpinv_get_discount_types() );
+        $allowed_discount_types = array_keys( wpinv_get_discount_types() );
 		
-		$return = array(
+        $return = array(
             'ID'                          => null,
             'code'                        => '',
             'amount'                      => 0,
             'date_created'                => current_time('mysql'),
             'date_modified'               => current_time('mysql'),
-			'expiration'                  => null,
-			'start'                  	  => current_time('mysql'),
-			'status'                  	  => 'draft',
+            'expiration'                  => null,
+            'start'                  	  => current_time('mysql'),
+            'status'                  	  => 'draft',
             'type'               		  => 'percent',
             'description'                 => '',
             'uses'                        => 0,
@@ -254,426 +254,426 @@ 
             'max_uses'                    => 0,
             'is_recurring'                => false,
             'min_total'                   => '',
-			'max_total'              	  => '',
-		);
+            'max_total'              	  => '',
+        );
 		
 				
-		// Arrays only please.
-		if ( ! is_array( $data ) ) {
+        // Arrays only please.
+        if ( ! is_array( $data ) ) {
             return $return;
         }
 
-		// If an id is provided, ensure it is a valid discount.
+        // If an id is provided, ensure it is a valid discount.
         if ( ! empty( $data['ID'] ) && ( ! is_numeric( $data['ID'] ) || 'wpi_discount' !== get_post_type( $data['ID'] ) ) ) {
             return $return;
-		}
+        }
 
         $return = array_merge( $return, $data );
 
         // Sanitize some keys.
         $return['amount']         = wpinv_sanitize_amount( $return['amount'] );
-		$return['is_single_use']  = (bool) $return['is_single_use'];
-		$return['is_recurring']   = (bool) $return['is_recurring'];
-		$return['uses']	          = (int) $return['uses'];
-		$return['max_uses']	      = (int) $return['max_uses'];
-		$return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
+        $return['is_single_use']  = (bool) $return['is_single_use'];
+        $return['is_recurring']   = (bool) $return['is_recurring'];
+        $return['uses']	          = (int) $return['uses'];
+        $return['max_uses']	      = (int) $return['max_uses'];
+        $return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
         $return['max_total'] 	  = wpinv_sanitize_amount( $return['max_total'] );
 
-		// Trim all values.
-		$return = wpinv_clean( $return );
+        // Trim all values.
+        $return = wpinv_clean( $return );
 		
-		// Ensure the discount type is supported.
+        // Ensure the discount type is supported.
         if ( ! in_array( $return['type'], $allowed_discount_types, true ) ) {
             $return['type'] = 'percent';
-		}
-		$return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
+        }
+        $return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
 		
-		// Do not offer more than a 100% discount.
-		if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
-			$return['amount'] = 100;
-		}
-
-		// Format dates.
-		foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
-			if( ! empty( $return[$prop] ) ) {
-				$return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
-			}
-		}
-
-		// Formart items.
-		foreach( array( 'excluded_items', 'items' ) as $prop ) {
-
-			if( ! empty( $return[$prop] ) ) {
-				// Ensure that the property is an array of non-empty integers.
-				$return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
-			} else {
-				$return[$prop]      = array();
-			}
-
-		}
+        // Do not offer more than a 100% discount.
+        if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
+            $return['amount'] = 100;
+        }
+
+        // Format dates.
+        foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
+            if( ! empty( $return[$prop] ) ) {
+                $return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
+            }
+        }
+
+        // Formart items.
+        foreach( array( 'excluded_items', 'items' ) as $prop ) {
+
+            if( ! empty( $return[$prop] ) ) {
+                // Ensure that the property is an array of non-empty integers.
+                $return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
+            } else {
+                $return[$prop]      = array();
+            }
+
+        }
 		
-		return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
-	}
+        return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
+    }
 	
-	/**
-	 * 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");
-	}
+    /**
+     * 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");
+    }
 	
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function __get( $key ) {
-		return $this->get( $key );
-	}
-
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function get( $key ) {
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function __get( $key ) {
+        return $this->get( $key );
+    }
+
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function get( $key ) {
 		
-		if ( $key == 'id' ) {
-			$key = 'ID';
-		}
+        if ( $key == 'id' ) {
+            $key = 'ID';
+        }
 		
-		if( method_exists( $this, "get_$key") ) {
-			$value 	= call_user_func( array( $this, "get_$key" ) );
-		} else if( isset( $this->data[$key] ) ) {
-			$value 	= $this->data[$key];
-		} else {
-			$value = null;
-		}
+        if( method_exists( $this, "get_$key") ) {
+            $value 	= call_user_func( array( $this, "get_$key" ) );
+        } else if( isset( $this->data[$key] ) ) {
+            $value 	= $this->data[$key];
+        } else {
+            $value = null;
+        }
 		
-		/**
-		 * Filters a discount's property value.
-		 * 
-		 * The dynamic part ($key) can be any property name e.g items, code, type etc.
-		 * 
-		 * @param mixed          $value    The property's value.
-		 * @param int            $ID       The discount's ID.
-		 * @param WPInv_Discount $discount The discount object.
-		 * @param string         $code     The discount's discount code.
-		 * @param array          $data     The discount's data array.
-		 */
-		return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
-
-	}
+        /**
+         * Filters a discount's property value.
+         * 
+         * The dynamic part ($key) can be any property name e.g items, code, type etc.
+         * 
+         * @param mixed          $value    The property's value.
+         * @param int            $ID       The discount's ID.
+         * @param WPInv_Discount $discount The discount object.
+         * @param string         $code     The discount's discount code.
+         * @param array          $data     The discount's data array.
+         */
+        return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
+
+    }
 	
-	/**
-	 * Magic method for setting discount fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
+    /**
+     * Magic method for setting discount fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
 		
-		if ( 'id' == strtolower( $key ) ) {
+        if ( 'id' == strtolower( $key ) ) {
 			
-			$this->ID = $value;
-			$this->data['ID'] = $value;
-			return;
+            $this->ID = $value;
+            $this->data['ID'] = $value;
+            return;
 			
-		}
+        }
 		
-		/**
-		 * Filters a discount's property value before it is saved.
-		 * 
-		 * 
-		 * 
-		 * The dynamic part ($key) can be any property name e.g items, code, type etc.
-		 * 
-		 * @param mixed          $value    The property's value.
-		 * @param int            $ID       The discount's ID.
-		 * @param WPInv_Discount $discount The discount object.
-		 * @param string         $code     The discount's discount code.
-		 * @param array          $data     The discount's data array.
-		 */
-		$value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
-
-		if( method_exists( $this, "set_$key") ) {
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->data[$key] = $value;
-		}
+        /**
+         * Filters a discount's property value before it is saved.
+         * 
+         * 
+         * 
+         * The dynamic part ($key) can be any property name e.g items, code, type etc.
+         * 
+         * @param mixed          $value    The property's value.
+         * @param int            $ID       The discount's ID.
+         * @param WPInv_Discount $discount The discount object.
+         * @param string         $code     The discount's discount code.
+         * @param array          $data     The discount's data array.
+         */
+        $value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
+
+        if( method_exists( $this, "set_$key") ) {
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->data[$key] = $value;
+        }
 		
-	}
+    }
 	
-	/**
-	 * Saves (or updates) a discount to the database
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function save(){
+    /**
+     * Saves (or updates) a discount to the database
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function save(){
 		
-		$data = self::sanitize_discount_data( $this->data );
+        $data = self::sanitize_discount_data( $this->data );
 
-		// Should we create a new post?
-		if( ! $data[ 'ID' ] ) {
+        // Should we create a new post?
+        if( ! $data[ 'ID' ] ) {
 
-			$id = wp_insert_post( array(
-				'post_status'           => $data['status'],
-				'post_type'             => 'wpi_discount',
-				'post_excerpt'          => $data['description'],
-			) );
+            $id = wp_insert_post( array(
+                'post_status'           => $data['status'],
+                'post_type'             => 'wpi_discount',
+                'post_excerpt'          => $data['description'],
+            ) );
 
-			if( empty( $id ) ) {
-				return false;
-			}
+            if( empty( $id ) ) {
+                return false;
+            }
 
-			$data[ 'ID' ] = (int) $id;
-			$this->ID = $data[ 'ID' ];
-			$this->data['ID'] = $data[ 'ID' ];
+            $data[ 'ID' ] = (int) $id;
+            $this->ID = $data[ 'ID' ];
+            $this->data['ID'] = $data[ 'ID' ];
 
-		} else {
-			$this->update_status( $data['status'] );
-		}
+        } else {
+            $this->update_status( $data['status'] );
+        }
 
-		$meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
+        $meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
 
-		do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
+        do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
 
-		foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
-			if ( isset( $meta[$prop] ) ) {
-				unset( $meta[$prop] );
-			}
-		}
+        foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
+            if ( isset( $meta[$prop] ) ) {
+                unset( $meta[$prop] );
+            }
+        }
 
-		if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
-			unset( $meta['uses'] );
-		}
+        if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
+            unset( $meta['uses'] );
+        }
 
-		// Save the metadata.
-		foreach( $meta as $key => $value ) {
-			update_post_meta( $this->ID, "_wpi_discount_$key", $value );
-		}
+        // Save the metadata.
+        foreach( $meta as $key => $value ) {
+            update_post_meta( $this->ID, "_wpi_discount_$key", $value );
+        }
 
-		$this->refresh();
+        $this->refresh();
 
-		do_action( 'wpinv_post_update_discount', $meta, $this->ID );
+        do_action( 'wpinv_post_update_discount', $meta, $this->ID );
 
-		return true;		
-	}
+        return true;		
+    }
 
-	/**
-	 * Refreshes the discount data.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function refresh(){
+    /**
+     * Refreshes the discount data.
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function refresh(){
 
-		// Empty the cache for this discount.
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-		wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
+        // Empty the cache for this discount.
+        wp_cache_delete( $this->ID, 'WPInv_Discounts' );
+        wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
 
-		$data = self::get_data_by( 'id', $this->ID );
-		if( is_array( $data ) ) {
-			$this->init( $data );
-		} else {
-			$this->init( array() );
-		}
+        $data = self::get_data_by( 'id', $this->ID );
+        if( is_array( $data ) ) {
+            $this->init( $data );
+        } else {
+            $this->init( array() );
+        }
 
-	}
+    }
 
-	/**
-	 * Saves (or updates) a discount to the database
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function update_status( $status = 'publish' ){
+    /**
+     * Saves (or updates) a discount to the database
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function update_status( $status = 'publish' ){
 
 
-		if ( $this->exists() && $this->old_status != $status ) {
+        if ( $this->exists() && $this->old_status != $status ) {
 
-			do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
-        	$updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
-			do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
+            do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
+            $updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
+            do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
 
-			$this->refresh();
+            $this->refresh();
 
-			return $updated !== 0;
+            return $updated !== 0;
 			
-		}
+        }
 
-		return false;		
-	}
+        return false;		
+    }
 	
 	
-	/**
-	 * Checks whether a discount exists in the database or not
-	 * 
-	 * @since 1.0.15
-	 */
-	public function exists(){
-		return ! empty( $this->ID );
-	}
+    /**
+     * Checks whether a discount exists in the database or not
+     * 
+     * @since 1.0.15
+     */
+    public function exists(){
+        return ! empty( $this->ID );
+    }
 	
-	// Boolean methods
+    // Boolean methods
 	
-	/**
-	 * 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->type == $type;
-	}
+    /**
+     * 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->type == $type;
+    }
 	
-	/**
-	 * Checks whether the discount is published or not
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->status == 'publish';
-	}
+    /**
+     * Checks whether the discount is published or not
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_active() {
+        return $this->status == 'publish';
+    }
 	
-	/**
-	 * Checks whether the discount is has exided the usage limit or not
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_exceeded_limit() {
-		if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
-			return false ;
-		}
+    /**
+     * Checks whether the discount is has exided the usage limit or not
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_exceeded_limit() {
+        if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
+            return false ;
+        }
 		
-		$exceeded =  $this->uses >= $this->max_uses;
-		return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
-	}
+        $exceeded =  $this->uses >= $this->max_uses;
+        return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
+    }
 	
-	/**
-	 * Checks if the discount is expired
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_expired() {
-		$expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
-		return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
-	}
-
-	/**
-	 * Checks the discount start date.
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_started() {
-		$started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
-		return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
-	}
+    /**
+     * Checks if the discount is expired
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_expired() {
+        $expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
+        return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
+    }
+
+    /**
+     * Checks the discount start date.
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_started() {
+        $started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
+        return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
+    }
 	
-	/**
-	 * 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 ) {
+    /**
+     * 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 = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
-		$included = array_intersect( $item_ids, $this->items );
-		$excluded = array_intersect( $item_ids, $this->excluded_items );
-
-		if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
-			return false;
-		}
-
-		if( ! empty( $this->items ) && empty( $included ) ) {
-			return false;
-		}
-		return true;
-	}
+        $item_ids = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
+        $included = array_intersect( $item_ids, $this->items );
+        $excluded = array_intersect( $item_ids, $this->excluded_items );
+
+        if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
+            return false;
+        }
+
+        if( ! empty( $this->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 met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_minimum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
-		return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
-	}
-
-	/**
-	 * 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( $amount );
-		$max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
-		return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
-	}
-
-	/**
-	 * 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 ) {
-		global $wpi_checkout_id;
-
-		if( empty( $user ) || empty( $this->is_single_use ) ) {
-			return true;
-		}
-
-		$user_id = 0;
+    /**
+     * 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 met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_minimum_amount_met( $amount ) {
+        $amount = floatval( $amount );
+        $min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
+        return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
+    }
+
+    /**
+     * 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( $amount );
+        $max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
+        return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
+    }
+
+    /**
+     * 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 ) {
+        global $wpi_checkout_id;
+
+        if( empty( $user ) || empty( $this->is_single_use ) ) {
+            return true;
+        }
+
+        $user_id = 0;
         if ( is_int( $user ) ) {
             $user_id = absint( $user );
         } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
@@ -682,164 +682,164 @@ 
             $user_id = $user_data->ID;
         } else if ( absint( $user ) > 0 ) {
             $user_id = absint( $user );
-		}
+        }
 
-		if ( empty( $user_id ) ) {
-			return true;
-		}
+        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 ) ); 
-		$code     = strtolower( $this->code );
+        $code     = strtolower( $this->code );
 
-		foreach ( $payments as $payment ) {
+        foreach ( $payments as $payment ) {
 
-			// Don't count discount used for current invoice checkout.
-			if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
-				continue;
-			}
+            // Don't count discount used for current invoice checkout.
+            if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+                continue;
+            }
 			
-			if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
-				continue;
-			}
-
-			$discounts = $payment->get_discounts( true );
-			if ( empty( $discounts ) ) {
-				continue;
-			}
-
-			$discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
-			if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes the discount from the database
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function remove() {
-
-		if ( empty( $this->ID ) ) {
-			return true;
-		}
-
-		do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-    	wp_delete_post( $this->ID, true );
-		wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
-    	do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
-
-		$this->ID = null;
-		$this->data['id'] = null;
-		return true;
-	}
-
-	/**
-	 * 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 ) {
-
-		$this->uses = $this->uses + $by;
-
-		if( $this->uses  < 0 ) {
-			$this->uses = 0;
-			update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
-		}
-
-		$this->save();
-
-		if( $by > 0 ) {
-			do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
-		} else {
-			do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
-		}
+            if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
+                continue;
+            }
+
+            $discounts = $payment->get_discounts( true );
+            if ( empty( $discounts ) ) {
+                continue;
+            }
+
+            $discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
+            if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes the discount from the database
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function remove() {
+
+        if ( empty( $this->ID ) ) {
+            return true;
+        }
+
+        do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
+        wp_cache_delete( $this->ID, 'WPInv_Discounts' );
+        wp_delete_post( $this->ID, true );
+        wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
+        do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
+
+        $this->ID = null;
+        $this->data['id'] = null;
+        return true;
+    }
+
+    /**
+     * 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 ) {
+
+        $this->uses = $this->uses + $by;
+
+        if( $this->uses  < 0 ) {
+            $this->uses = 0;
+            update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
+        }
+
+        $this->save();
+
+        if( $by > 0 ) {
+            do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
+        } else {
+            do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
+        }
 		
-		return $this->uses;
-	}
-
-	/**
-	 * Retrieves discount data
-	 *
-	 * @since 1.0.15
-	 * @return array
-	 */
-	public function get_data() {
-		$return = array();
-		foreach( array_keys( $this->data ) as $key ) {
-			$return[ $key ] = $this->get( $key );
-		}
-		return $return;
-	}
-
-	/**
-	 * Retrieves discount data as json
-	 *
-	 * @since 1.0.15
-	 * @return string|false
-	 */
-	public function get_data_as_json() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Checks if a discount can only be used once per user.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function get_is_single_use() {
-		return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
-	}
-
-	/**
-	 * Checks if a discount is recurring.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function get_is_recurring() {
-		return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
-	}
-
-	/**
-	 * Returns a discount's included items.
-	 *
-	 * @since 1.0.15
-	 * @return array
-	 */
-	public function get_items() {
-		return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
-	}
-
-	/**
-	 * Returns a discount's discounted amount.
-	 *
-	 * @since 1.0.15
-	 * @return float
-	 */
-	public function get_discounted_amount( $amount ) {
-
-		if ( $this->type == 'flat' ) {
+        return $this->uses;
+    }
+
+    /**
+     * Retrieves discount data
+     *
+     * @since 1.0.15
+     * @return array
+     */
+    public function get_data() {
+        $return = array();
+        foreach( array_keys( $this->data ) as $key ) {
+            $return[ $key ] = $this->get( $key );
+        }
+        return $return;
+    }
+
+    /**
+     * Retrieves discount data as json
+     *
+     * @since 1.0.15
+     * @return string|false
+     */
+    public function get_data_as_json() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Checks if a discount can only be used once per user.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function get_is_single_use() {
+        return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
+    }
+
+    /**
+     * Checks if a discount is recurring.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function get_is_recurring() {
+        return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
+    }
+
+    /**
+     * Returns a discount's included items.
+     *
+     * @since 1.0.15
+     * @return array
+     */
+    public function get_items() {
+        return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
+    }
+
+    /**
+     * Returns a discount's discounted amount.
+     *
+     * @since 1.0.15
+     * @return float
+     */
+    public function get_discounted_amount( $amount ) {
+
+        if ( $this->type == 'flat' ) {
             $amount = $amount - $this->amount;
-		} else {
+        } else {
             $amount = $amount - ( $amount * ( $this->amount / 100 ) );
-		}
+        }
 
-		if ( $amount < 0 ) {
-			$amount = 0;
-		}
+        if ( $amount < 0 ) {
+            $amount = 0;
+        }
 
-		return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
-	}
+        return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
+    }
 	
 }

includes/wpinv-helper-functions.php

Indentation +13 added lines, -13 removed lines

@@ -700,7 +700,7 @@ 
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {
@@ -1038,11 +1038,11 @@ 
  * @return array Sanitized array of values.
  */
 function wpinv_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-	}
+    if ( ! is_array( $list ) ) {
+        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+    }
 
-	return $list;
+    return $list;
 }
 
 /**
@@ -1062,9 +1062,9 @@ 
     }
 
     $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-$key", $data, 'wpinv' );
+    wp_cache_set( "wpinv-$key", $data, 'wpinv' );
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -1093,17 +1093,17 @@ 
  */
 function wpinv_clean( $var ) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+    if ( is_array( $var ) ) {
+        return array_map( 'wpinv_clean', $var );
     }
 
     if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+        $object_vars = get_object_vars( $var );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $var->$property_name = wpinv_clean( $property_value );
         }
         return $var;
-	}
+    }
     
     return is_string( $var ) ? sanitize_text_field( $var ) : $var;
 }
\ No newline at end of file

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

Indentation +310 added lines, -310 removed lines

@@ -1,271 +1,271 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
-	/**
-	 * Allow the quick setup and connection of our AyeCode Connect plugin.
-	 *
-	 * Class AyeCode_Connect_Helper
-	 */
-	class AyeCode_Connect_Helper {
-
-		// Hold the version number
-		var $version = "1.0.3";
-
-		// Hold the default strings.
-		var $strings = array();
-
-		// Hold the default pages.
-		var $pages = array();
-
-		/**
-		 * The constructor.
-		 *
-		 * AyeCode_Connect_Helper constructor.
-		 *
-		 * @param array $strings
-		 * @param array $pages
-		 */
-		public function __construct( $strings = array(), $pages = array() ) {
-
-			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-
-
-				// set default strings
-				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?" ),
-					'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site" ),
-					'connecting_button' => __( "Connecting..." ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
-					'error'             => __( "Something went wrong, please refresh and try again." ),
-				);
-				$this->strings   = array_merge( $default_strings, $strings );
-
-
-				// set default pages
-				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
-
-				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
-
-				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
-				}
-			}
-
-			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
-			}
-
-		}
-
-		/**
-		 * Give a way to check we can connect via a external redirect.
-		 */
-		public function ayecode_connect_helper_installed(){
-			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
-			);
-			wp_send_json_success( $active );
-			wp_die();
-		}
-
-		/**
-		 * Get slug from path
-		 *
-		 * @param  string $key
-		 *
-		 * @return string
-		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
-
-			return $slug[0];
-		}
-
-		/**
-		 * Install and activate the AyeCode Connect Plugin
-		 */
-		public function ayecode_connect_install() {
-
-			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-
-			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
-
-			$success     = true;
-			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
-				WP_Filesystem();
-
-				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
-				$plugin_slug       = $plugin_slug;
-				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
-				$installed         = false;
-				$activate          = false;
-
-				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
-					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
-				}
-
-				// Install this thing!
-				if ( ! $installed ) {
-
-					// Suppress feedback
-					ob_start();
-
-					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
-							'slug'   => $plugin_slug,
-							'fields' => array(
-								'short_description' => false,
-								'sections'          => false,
-								'requires'          => false,
-								'rating'            => false,
-								'ratings'           => false,
-								'downloaded'        => false,
-								'last_updated'      => false,
-								'added'             => false,
-								'tags'              => false,
-								'homepage'          => false,
-								'donate_link'       => false,
-								'author_profile'    => false,
-								'author'            => false,
-							),
-						) );
-
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
-						}
-
-						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
-
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
-						}
-
-						$working_dir = $upgrader->unpack_package( $download, true );
-
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
-						}
-
-						$result = $upgrader->install_package( array(
-							'source'                      => $working_dir,
-							'destination'                 => WP_PLUGIN_DIR,
-							'clear_destination'           => false,
-							'abort_if_destination_exists' => false,
-							'clear_working'               => true,
-							'hook_extra'                  => array(
-								'type'   => 'plugin',
-								'action' => 'install',
-							),
-						) );
-
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
-						}
-
-						$activate = true;
-
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-
-					// Discard feedback
-					ob_end_clean();
-				}
-
-				wp_clean_plugins_cache();
-
-				// Activate this thing
-				if ( $activate ) {
-					try {
-						$result = activate_plugin( $plugin );
-
-						if ( is_wp_error( $result ) ) {
-							$success = false;
-						} else {
-							$success = true;
-						}
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-				}
-			}
-
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
-				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
-			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-			wp_die();
-		}
-
-		/**
-		 * Check if maybe localhost.
-		 *
-		 * @return bool
-		 */
-		public function is_localhost() {
-			$localhost = false;
-
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
-			$localhost_domains = array(
-				'localhost',
-				'localhost.localdomain',
-				'127.0.0.1',
-				'::1'
-			);
-
-			if ( in_array( $host, $localhost_domains ) ) {
-				$localhost = true;
-			}
-
-			return $localhost;
-		}
-
-		/**
-		 * Show notice to connect site.
-		 */
-		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
-				$connect_title_string     = $this->strings['connect_title'];
-				$connect_external_string  = $this->strings['connect_external'];
-				$connect_string           = $this->strings['connect'];
-				$connect_button_string    = $this->strings['connect_button'];
-				$connecting_button_string = $this->strings['connecting_button'];
-				?>
+    /**
+     * Allow the quick setup and connection of our AyeCode Connect plugin.
+     *
+     * Class AyeCode_Connect_Helper
+     */
+    class AyeCode_Connect_Helper {
+
+        // Hold the version number
+        var $version = "1.0.3";
+
+        // Hold the default strings.
+        var $strings = array();
+
+        // Hold the default pages.
+        var $pages = array();
+
+        /**
+         * The constructor.
+         *
+         * AyeCode_Connect_Helper constructor.
+         *
+         * @param array $strings
+         * @param array $pages
+         */
+        public function __construct( $strings = array(), $pages = array() ) {
+
+            // Only fire if not localhost and the current user has the right permissions.
+            if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+
+
+                // set default strings
+                $default_strings = array(
+                    'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
+                    'connect_external'  => __( "Please confirm you wish to connect your site?" ),
+                    'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+                    'connect_button'    => __( "Connect Site" ),
+                    'connecting_button' => __( "Connecting..." ),
+                    'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
+                    'error'             => __( "Something went wrong, please refresh and try again." ),
+                );
+                $this->strings   = array_merge( $default_strings, $strings );
+
+
+                // set default pages
+                $default_pages = array();
+                $this->pages   = array_merge( $default_pages, $pages );
+
+                // maybe show connect site notice
+                add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+
+                // add ajax action if not already added
+                if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
+                    add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+                }
+            }
+
+            // add ajax action if not already added
+            if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
+                add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+            }
+
+        }
+
+        /**
+         * Give a way to check we can connect via a external redirect.
+         */
+        public function ayecode_connect_helper_installed(){
+            $active = array(
+                'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
+                'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
+                'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+            );
+            wp_send_json_success( $active );
+            wp_die();
+        }
+
+        /**
+         * Get slug from path
+         *
+         * @param  string $key
+         *
+         * @return string
+         */
+        private function format_plugin_slug( $key ) {
+            $slug = explode( '/', $key );
+            $slug = explode( '.', end( $slug ) );
+
+            return $slug[0];
+        }
+
+        /**
+         * Install and activate the AyeCode Connect Plugin
+         */
+        public function ayecode_connect_install() {
+
+            // bail if localhost
+            if ( $this->is_localhost() ) {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+
+            // Explicitly clear the event.
+            wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+
+            $success     = true;
+            $plugin_slug = "ayecode-connect";
+            if ( ! empty( $plugin_slug ) ) {
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+                WP_Filesystem();
+
+                $skin              = new Automatic_Upgrader_Skin;
+                $upgrader          = new WP_Upgrader( $skin );
+                $installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+                $plugin_slug       = $plugin_slug;
+                $plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+                $installed         = false;
+                $activate          = false;
+
+                // See if the plugin is installed already
+                if ( in_array( $plugin_slug, $installed_plugins ) ) {
+                    $installed = true;
+                    $activate  = ! is_plugin_active( $plugin );
+                }
+
+                // Install this thing!
+                if ( ! $installed ) {
+
+                    // Suppress feedback
+                    ob_start();
+
+                    try {
+                        $plugin_information = plugins_api( 'plugin_information', array(
+                            'slug'   => $plugin_slug,
+                            'fields' => array(
+                                'short_description' => false,
+                                'sections'          => false,
+                                'requires'          => false,
+                                'rating'            => false,
+                                'ratings'           => false,
+                                'downloaded'        => false,
+                                'last_updated'      => false,
+                                'added'             => false,
+                                'tags'              => false,
+                                'homepage'          => false,
+                                'donate_link'       => false,
+                                'author_profile'    => false,
+                                'author'            => false,
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $plugin_information ) ) {
+                            throw new Exception( $plugin_information->get_error_message() );
+                        }
+
+                        $package  = $plugin_information->download_link;
+                        $download = $upgrader->download_package( $package );
+
+                        if ( is_wp_error( $download ) ) {
+                            throw new Exception( $download->get_error_message() );
+                        }
+
+                        $working_dir = $upgrader->unpack_package( $download, true );
+
+                        if ( is_wp_error( $working_dir ) ) {
+                            throw new Exception( $working_dir->get_error_message() );
+                        }
+
+                        $result = $upgrader->install_package( array(
+                            'source'                      => $working_dir,
+                            'destination'                 => WP_PLUGIN_DIR,
+                            'clear_destination'           => false,
+                            'abort_if_destination_exists' => false,
+                            'clear_working'               => true,
+                            'hook_extra'                  => array(
+                                'type'   => 'plugin',
+                                'action' => 'install',
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $result ) ) {
+                            throw new Exception( $result->get_error_message() );
+                        }
+
+                        $activate = true;
+
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+
+                    // Discard feedback
+                    ob_end_clean();
+                }
+
+                wp_clean_plugins_cache();
+
+                // Activate this thing
+                if ( $activate ) {
+                    try {
+                        $result = activate_plugin( $plugin );
+
+                        if ( is_wp_error( $result ) ) {
+                            $success = false;
+                        } else {
+                            $success = true;
+                        }
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+                }
+            }
+
+            if ( $success && function_exists( 'ayecode_connect_args' ) ) {
+                ayecode_connect();// init
+                $args        = ayecode_connect_args();
+                $client      = new AyeCode_Connect( $args );
+                $redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
+                $redirect    = $client->build_connect_url( $redirect_to );
+                wp_send_json_success( array( 'connect_url' => $redirect ) );
+            } else {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+            wp_die();
+        }
+
+        /**
+         * Check if maybe localhost.
+         *
+         * @return bool
+         */
+        public function is_localhost() {
+            $localhost = false;
+
+            $host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+            $localhost_domains = array(
+                'localhost',
+                'localhost.localdomain',
+                '127.0.0.1',
+                '::1'
+            );
+
+            if ( in_array( $host, $localhost_domains ) ) {
+                $localhost = true;
+            }
+
+            return $localhost;
+        }
+
+        /**
+         * Show notice to connect site.
+         */
+        public function ayecode_connect_install_notice() {
+            if ( $this->maybe_show() ) {
+                $connect_title_string     = $this->strings['connect_title'];
+                $connect_external_string  = $this->strings['connect_external'];
+                $connect_string           = $this->strings['connect'];
+                $connect_button_string    = $this->strings['connect_button'];
+                $connecting_button_string = $this->strings['connecting_button'];
+                ?>
 				<div class="notice notice-info acch-notice">
 					<span class="acch-float-left">
 						<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1"
@@ -304,8 +304,8 @@ 
 						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
 					<p>
 						<?php
-						echo $connect_string;
-						?>
+                        echo $connect_string;
+                        ?>
 					</p>
 					</span>
 
@@ -318,9 +318,9 @@ 
 				</div>
 
 				<?php
-				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-					?>
+                // only include the popup HTML if needed.
+                if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                    ?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
 					<span class="acch-float-left">
@@ -369,23 +369,23 @@ 
 						</div>
 					</div>
 					<?php
-				}
-
-				// add required scripts
-				$this->script();
-			}
-		}
-
-		/**
-		 * Get the JS Script.
-		 */
-		public function script() {
-
-			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-				add_thickbox();
-			}
-			?>
+                }
+
+                // add required scripts
+                $this->script();
+            }
+        }
+
+        /**
+         * Get the JS Script.
+         */
+        public function script() {
+
+            // add thickbox if external request is requested
+            if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                add_thickbox();
+            }
+            ?>
 			<style>
 				.acch-title {
 					margin: 0;
@@ -454,43 +454,43 @@ 
 
 
 				<?php
-				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
-				?>
+                // add thickbox if external request is requested
+                if(! empty( $_REQUEST['external-connect-request'] )) {
+                ?>
 				jQuery(function () {
 					setTimeout(function () {
 						tb_show("AyeCode Connect", "?TB_inline?width=300&height=80&inlineId=ayecode-connect-helper-external-confirm");
 					}, 200);
 				});
 				<?php
-				}
-				?>
+                }
+                ?>
 
 			</script>
 			<?php
-		}
-
-		/**
-		 * Decide what pages to show on.
-		 *
-		 * @return bool
-		 */
-		public function maybe_show() {
-			$show = false;
-
-			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-
-				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
-					$show = true;
-				}
+        }
+
+        /**
+         * Decide what pages to show on.
+         *
+         * @return bool
+         */
+        public function maybe_show() {
+            $show = false;
+
+            // check if on a page set to show
+            if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+
+                // check if not active and connected
+                if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+                    $show = true;
+                }
 
-			}
+            }
 
-			return $show;
-		}
+            return $show;
+        }
 
-	}
+    }
 
 }

includes/admin/register-settings.php

Indentation +328 added lines, -328 removed lines

@@ -368,69 +368,69 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo $args['desc'];
     }
 }
 
 function wpinv_hidden_callback( $args ) {
-	global $wpinv_options;
-
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    global $wpinv_options;
+
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    } elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 function wpinv_checkbox_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$name = '';
-	} else {
-		$name = 'name="wpinv_settings[' . $sanitize_id . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $name = '';
+    } else {
+        $name = 'name="wpinv_settings[' . $sanitize_id . ']"';
+    }
 
-	$checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
-	$html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
+    $html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_checkout_fields_callback( $args ) {
@@ -438,260 +438,260 @@ 
 }
 
 function wpinv_multicheck_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+    if ( ! empty( $args['options'] ) ) {
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = wpinv_sanitize_key( $key );
+            if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . $args['desc'] . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( isset( $wpinv_options[$args['id']][$key] ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_radio_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     
     foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
-			$checked = true;
-		elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
-			$checked = true;
+        if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+            $checked = true;
+        elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
+            $checked = true;
 
-		echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
+    endforeach;
 
-	echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
 }
 
 function wpinv_gateways_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ( $args['options'] as $key => $option ) :
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         if ( isset( $wpinv_options['gateways'][ $key ] ) )
-			$enabled = '1';
-		else
-			$enabled = null;
+            $enabled = '1';
+        else
+            $enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+    endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 function wpinv_text_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
-	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
+    $size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
+    $html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_number_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
-	$min  = isset( $args['min'] ) ? $args['min'] : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $max  = isset( $args['max'] ) ? $args['max'] : 999999;
+    $min  = isset( $args['min'] ) ? $args['min'] : 0;
+    $step = isset( $args['step'] ) ? $args['step'] : 1;
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_textarea_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 function wpinv_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
     
     if( !empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
@@ -701,142 +701,142 @@ 
 
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $name ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_select_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wpinv_options, $wp_version;
+    global $wpinv_options, $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+        if( empty( $args['allow_blank'] ) && empty( $value ) ) {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html = ob_get_clean();
-	} else {
-		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html = ob_get_clean();
+    } else {
+        $html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[$args['id']];
-	} else {
-		$value = isset($args['std']) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[$args['id']];
+    } else {
+        $value = isset($args['std']) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+    $default = isset( $args['std'] ) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_tax_rates_callback($args) {
-	global $wpinv_options;
-	$rates = wpinv_get_tax_rates();
-	ob_start(); ?>
+    global $wpinv_options;
+    $rates = wpinv_get_tax_rates();
+    ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tax_tdbox">
 	<p><?php echo $args['desc']; ?></p>
@@ -860,40 +860,40 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[' . $sanitized_key . '][country]',
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[' . $sanitized_key . '][country]',
                         'id'               => 'tax_rates[' . $sanitized_key . '][country]',
-						'selected'         => $rate['country'],
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
-					?>
+                        'selected'         => $rate['country'],
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) );
+                    ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php
-					$states = wpinv_get_country_states( $rate['country'] );
-					if( !empty( $states ) ) {
-						echo wpinv_html_select( array(
-							'options'          => array_merge( array( '' => '' ), $states ),
-							'name'             => 'tax_rates[' . $sanitized_key . '][state]',
+                    $states = wpinv_get_country_states( $rate['country'] );
+                    if( !empty( $states ) ) {
+                        echo wpinv_html_select( array(
+                            'options'          => array_merge( array( '' => '' ), $states ),
+                            'name'             => 'tax_rates[' . $sanitized_key . '][state]',
                             'id'               => 'tax_rates[' . $sanitized_key . '][state]',
-							'selected'         => $rate['state'],
-							'show_option_all'  => false,
-							'show_option_none' => false,
+                            'selected'         => $rate['state'],
+                            'show_option_all'  => false,
+                            'show_option_none' => false,
                             'class'            => 'wpi_select2',
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
-					} else {
-						echo wpinv_html_text( array(
-							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
+                            'placeholder'      => __( 'Choose a state', 'invoicing' )
+                        ) );
+                    } else {
+                        echo wpinv_html_text( array(
+                            'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
+                            'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
                             'id'    => 'tax_rates[' . $sanitized_key . '][state]',
-						) );
-					}
-					?>
+                        ) );
+                    }
+                    ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked( true, ! empty( $rate['global'] ) ); ?>/>
@@ -908,19 +908,19 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[0][country]',
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[0][country]',
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php echo wpinv_html_text( array(
-						'name' => 'tax_rates[0][state]'
-					) ); ?>
+                        'name' => 'tax_rates[0][state]'
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[0][global]" id="tax_rates[0][global]" value="1"/>
@@ -935,7 +935,7 @@ 
         <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span></td></tr></tfoot>
 	</table>
 	<?php
-	echo ob_get_clean();
+    echo ob_get_clean();
 }
 
 function wpinv_tools_callback($args) {
@@ -963,15 +963,15 @@ 
 }
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 

includes/admin/admin-pages.php

Indentation +3 added lines, -3 removed lines

@@ -502,7 +502,7 @@ 
     if( isset( $_GET['page'] ) && 'wpinv-settings' == $_GET['page'] ) {
 
         // Sweetalert https://sweetalert2.github.io/.
-		wp_register_script( 'promise-polyfill', WPINV_PLUGIN_URL . 'assets/vendor/sweetalert/promise-polyfill.min.js', array(), '8.1.3', true );
+        wp_register_script( 'promise-polyfill', WPINV_PLUGIN_URL . 'assets/vendor/sweetalert/promise-polyfill.min.js', array(), '8.1.3', true );
         wp_register_script( 'sweetalert2', WPINV_PLUGIN_URL . 'assets/vendor/sweetalert/sweetalert2.all.min.js', array( 'promise-polyfill' ), '9.6.0', true );
 
         // Vue js.
@@ -527,9 +527,9 @@ 
             );
 
             // localize and enqueue the script with all of the variable inserted.
-		    wp_localize_script( 'wpinv-field-editor', 'wpinvFieldEditor', $params );
+            wp_localize_script( 'wpinv-field-editor', 'wpinvFieldEditor', $params );
 
-		    wp_enqueue_script( 'wpinv-field-editor' );
+            wp_enqueue_script( 'wpinv-field-editor' );
         }
 
     }

includes/wpinv-invoice-functions.php

Indentation +70 added lines, -70 removed lines

@@ -700,7 +700,7 @@ 
 }
 
 function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice( $invoice_id );
     return $invoice->get_key();
 }
 
@@ -950,7 +950,7 @@ 
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
-	if ( empty( $invoice ) ) {
+    if ( empty( $invoice ) ) {
         return false;
     }
 
@@ -1247,20 +1247,20 @@ 
 }
 
 function wpinv_checkout_get_cc_info() {
-	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
-
-	// Return cc info
-	return $cc_info;
+    $cc_info = array();
+    $cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
+    $cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
+    $cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
+    $cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
+    $cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
+    $cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
+    $cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
+    $cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
+    $cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
+    $cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+
+    // Return cc info
+    return $cc_info;
 }
 
 function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
@@ -1467,7 +1467,7 @@ 
         $required_fields  = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
+            if ( !empty( $required_fields ) ) {
             foreach ( $required_fields as $field_name => $value ) {
                 if ( empty( $_POST[ $field_name ] ) ) {
                     wpinv_set_error( $value['error_id'], $value['error_message'] );
@@ -1589,7 +1589,7 @@ 
 }
 
 function wpinv_get_checkout_session() {
-	global $wpi_session;
+    global $wpi_session;
     
     return $wpi_session->get( 'wpinv_checkout' );
 }
@@ -1697,7 +1697,7 @@ 
         $response['data']['taxf']       = $invoice->get_tax( true );
         $response['data']['total']      = $invoice->get_total();
         $response['data']['totalf']     = $invoice->get_total( true );
-	    $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
+        $response['data']['free']       = $invoice->is_free() && ( ! ( (float) $response['data']['total'] > 0 ) || $invoice->is_free_trial() ) ? true : false;
 
         wp_send_json( $response );
     }
@@ -1986,57 +1986,57 @@ 
 }
 
 function wpinv_get_invoice_id_by_key( $key ) {
-	global $wpdb;
+    global $wpdb;
 
-	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
+    $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
 
-	if ( $invoice_id != NULL )
-		return $invoice_id;
+    if ( $invoice_id != NULL )
+        return $invoice_id;
 
-	return 0;
+    return 0;
 }
 
 function wpinv_can_view_receipt( $invoice_key = '' ) {
-	$return = false;
+    $return = false;
 
-	if ( empty( $invoice_key ) ) {
-		return $return;
-	}
+    if ( empty( $invoice_key ) ) {
+        return $return;
+    }
 
-	global $wpinv_receipt_args;
+    global $wpinv_receipt_args;
 
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
-	}
+    $wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
+    if ( isset( $_GET['invoice-id'] ) ) {
+        $wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+    }
 
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
-		return $return;
-	}
+    if ( empty( $wpinv_receipt_args['id'] ) ) {
+        return $return;
+    }
 
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
-		return $return;
-	}
+    $invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
+    if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+        return $return;
+    }
 
-	if ( is_user_logged_in() ) {
-		if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
-			$return = true;
-		}
-	}
+    if ( is_user_logged_in() ) {
+        if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
+            $return = true;
+        }
+    }
 
-	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+    $session = wpinv_get_checkout_session();
+    if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
+        $check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
 
-		if ( wpinv_require_login_to_checkout() ) {
-			$return = $return && $check_key === $invoice_key;
-		} else {
-			$return = $check_key === $invoice_key;
-		}
-	}
+        if ( wpinv_require_login_to_checkout() ) {
+            $return = $return && $check_key === $invoice_key;
+        } else {
+            $return = $check_key === $invoice_key;
+        }
+    }
 
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+    return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
 }
 
 function wpinv_pay_for_invoice() {
@@ -2346,14 +2346,14 @@ 
 
     if ( isset( $_GET['invoice_key'] ) || is_singular( 'wpi_invoice' ) || is_singular( 'wpi_quote' ) ) {
         $invoice_key = isset( $_GET['invoice_key'] ) ? urldecode($_GET['invoice_key']) : '';
-	    global $post;
+        global $post;
 
         if(!empty($invoice_key)){
-	        $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
+            $invoice_id = wpinv_get_invoice_id_by_key($invoice_key);
         } else if(!empty( $post ) && ($post->post_type == 'wpi_invoice' || $post->post_type == 'wpi_quote')) {
-			$invoice_id = $post->ID;
+            $invoice_id = $post->ID;
         } else {
-        	return;
+            return;
         }
 
         $invoice = new WPInv_Invoice($invoice_id);
@@ -2362,17 +2362,17 @@ 
             return;
         }
 
-	    if ( is_user_logged_in() ) {
-		    if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    }
-	    } else {
-		    if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
-			    update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
-		    }
-	    }
+        if ( is_user_logged_in() ) {
+            if ( (int)$invoice->get_user_id() === get_current_user_id() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            } else if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            }
+        } else {
+            if ( !wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && $_GET['invoice_key'] === $invoice->get_key() ) {
+                update_post_meta($invoice_id,'_wpinv_is_viewed', 1);
+            }
+        }
     }
 
 }